Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 29445: - improve error checking - fix a memory leak
by janderwald＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: janderwald Date: Mon Oct 8 00:17:54 2007 New Revision: 29445 URL: http://svn.reactos.org/svn/reactos?rev=29445&view=rev Log: - improve error checking - fix a memory leak Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Oct 8 00:17:54 2007 @@ -70,10 +70,18 @@ else { cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; - m_BufferLength = 100; - m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); -#ifdef UNICODE - m_WBuffer = (WCHAR*)malloc(sizeof(WCHAR) * m_BufferLength); + + if (!m_Buffer) + { + m_BufferLength = 100; + m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); + } + +#ifdef UNICODE + if (!m_WBuffer) + { + m_WBuffer = (WCHAR*)malloc(sizeof(WCHAR) * m_BufferLength); + } #endif ConnectNamedPipe(h_Pipe, 0); @@ -90,8 +98,11 @@ else { cout << "NamedPipeReader::openPipe> successfully opened pipe handle: "<< h_Pipe << endl << "Src: " << PipeCmd << endl; - m_BufferLength = 100; - m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); + if (!m_Buffer) + { + m_BufferLength = 100; + m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); + } return true; } #endif @@ -240,12 +251,14 @@ if (!m_Buffer) { cerr << "Error: no memory" << endl; + return false; } #ifdef UNICODE if (!m_WBuffer) { cerr << "Error: no memory" << endl; + return false; } #endif

1 0

[janderwald] 29444: - improve debugging
by janderwald＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: janderwald Date: Mon Oct 8 00:05:27 2007 New Revision: 29444 URL: http://svn.reactos.org/svn/reactos?rev=29444&view=rev Log: - improve debugging Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Oct 8 00:05:27 2007 @@ -89,7 +89,7 @@ } else { - cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; + cout << "NamedPipeReader::openPipe> successfully opened pipe handle: "<< h_Pipe << endl << "Src: " << PipeCmd << endl; m_BufferLength = 100; m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); return true; @@ -255,7 +255,7 @@ memset(m_Buffer, 0x0, m_BufferLength * sizeof(char)); long cbRead = 0; - if (!readPipe(m_Buffer, 100, cbRead)) + if (!readPipe(m_Buffer, m_BufferLength-1, cbRead)) break; #ifdef UNICODE @@ -263,9 +263,9 @@ if (!UnicodeConverter::ansi2Unicode(m_Buffer, m_WBuffer, cbRead)) break; extractLines(m_WBuffer, vect, append_line, cbRead); -#endif +#else extractLines(m_Buffer, vect, append_line, cbRead); - +#endif }while (append_line);

1 0

[fireball] 29442: - Remove excessive debug output.
by fireball＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: fireball Date: Sun Oct 7 23:12:05 2007 New Revision: 29442 URL: http://svn.reactos.org/svn/reactos?rev=29442&view=rev Log: - Remove excessive debug output. Modified: branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/desktop.c branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/misc.c branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/window.c Modified: branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-stable/reactos/subsystem… ============================================================================== --- branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/desktop.c Sun Oct 7 23:12:05 2007 @@ -31,7 +31,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static @@ -725,7 +725,7 @@ if (!Desktop) { - DPRINT1("IntShellHookNotify: No desktop!\n"); + DPRINT("IntShellHookNotify: No desktop!\n"); return; } Modified: branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-stable/reactos/subsystem… ============================================================================== --- branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/misc.c Sun Oct 7 23:12:05 2007 @@ -11,8 +11,8 @@ #include <w32k.h> -//#define NDEBUG -#undef NDEBUG +#define NDEBUG +//#undef NDEBUG #include <debug.h> /* registered Logon process */ Modified: branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-stable/reactos/subsystem… ============================================================================== --- branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ branches/win32k-stable/reactos/subsystems/win32/win32k/ntuser/window.c Sun Oct 7 23:12:05 2007 @@ -2537,7 +2537,6 @@ if (Wnd->hSelf == IntGetDesktopWindow()) { - DPRINT1("Wnd->hSelf = %p, returning NULL\n", Wnd->hSelf); return NULL; }

1 0

[hpoussin] 29441: Do not delete section extension when storing it in the structure See issue #1147, 1845 for more details.
by hpoussin＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: hpoussin Date: Sun Oct 7 21:13:06 2007 New Revision: 29441 URL: http://svn.reactos.org/svn/reactos?rev=29441&view=rev Log: Do not delete section extension when storing it in the structure See issue #1147,1845 for more details. Modified: trunk/reactos/dll/win32/setupapi/driver.c Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c (original) +++ trunk/reactos/dll/win32/setupapi/driver.c Sun Oct 7 21:13:06 2007 @@ -124,7 +124,6 @@ HANDLE hFile = INVALID_HANDLE_VALUE; BOOL Result = FALSE; PLIST_ENTRY PreviousEntry; - LPWSTR pDot; BOOL ret = FALSE; driverInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DriverInfoElement)); @@ -158,9 +157,6 @@ /* Fill SectionName field */ lstrcpynW(driverInfo->Details.SectionName, SectionName, LINE_LEN); - pDot = strchrW(driverInfo->Details.SectionName, '.'); - if (pDot) - *pDot = UNICODE_NULL; /* Fill DrvDescription field */ lstrcpynW(driverInfo->Details.DrvDescription, DriverDescription, LINE_LEN); @@ -271,7 +267,8 @@ Result = SetupGetStringFieldW( &ContextDevice, 1, - SectionName, LINE_LEN, + SectionName, + LINE_LEN, NULL); if (!Result) goto cleanup;

1 0

[fireball] 29440: - Get rid of incompatible strtoull export in msvcrt.dll - Make dbghelp.dll use strtoui64 instead. Another solution would be to add it to libwine, but it will make code duplication even worse (strtoull is already implemented in two places).
by fireball＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: fireball Date: Sun Oct 7 20:42:10 2007 New Revision: 29440 URL: http://svn.reactos.org/svn/reactos?rev=29440&view=rev Log: - Get rid of incompatible strtoull export in msvcrt.dll - Make dbghelp.dll use strtoui64 instead. Another solution would be to add it to libwine, but it will make code duplication even worse (strtoull is already implemented in two places). Modified: trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stabs.c (original) +++ trunk/reactos/dll/win32/dbghelp/stabs.c Sun Oct 7 20:42:10 2007 @@ -61,6 +61,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); +UINT64 _strtoui64( const char *nptr, char **endptr, int base ); + #ifndef N_UNDF #define N_UNDF 0x00 #endif @@ -435,13 +437,13 @@ break; case '-': prv->sign = -1; - prv->val = strtoull(++ptd->ptr, &last, 10); + prv->val = _strtoui64(++ptd->ptr, &last, 10); ptd->ptr = last; break; case '+': default: prv->sign = 1; - prv->val = strtoull(ptd->ptr, &last, 10); + prv->val = _strtoui64(ptd->ptr, &last, 10); ptd->ptr = last; break; } Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def Sun Oct 7 20:42:10 2007 @@ -529,7 +529,6 @@ _strtime _strtoi64=stub _strtoui64=strtoull -_strtoull=strtoull _strupr _swab _sys_errlist DATA @@ -798,7 +797,6 @@ strtok strtol=NTDLL.strtol strtoul -strtoull strxfrm swprintf=crt_swprintf swscanf

1 0

[cfinck] 29439: Updated italian translations for access.cpl and ncpa.cpl by Paolo Devoti (devotip AT tiscali DOT it) See issue #2727 for more details.
by cfinck＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: cfinck Date: Sun Oct 7 19:38:04 2007 New Revision: 29439 URL: http://svn.reactos.org/svn/reactos?rev=29439&view=rev Log: Updated italian translations for access.cpl and ncpa.cpl by Paolo Devoti (devotip AT tiscali DOT it) See issue #2727 for more details. Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sun Oct 7 19:38:04 2007 @@ -52,15 +52,15 @@ AUTOCHECKBOX "&Usa Alto contrasto",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Impostazioni",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) - LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + GROUPBOX "Opzioni del cursore",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Usa la barra per modificare la velocità del lampeggio del cursore e il suo spessore.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Velocitaà del lampeggio:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Nessuno",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Veloce",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) - CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CTEXT "Spessore del cursore:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Sottile",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Spesso",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END @@ -105,178 +105,178 @@ IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Sticky Keys Settings" +CAPTION "Impostazione del blocco tasto" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(3) + LTEXT "Premere lo shift cinque volter per abilitare la funzione di blocco dei tasti.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(3) AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - GROUPBOX "Options",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + GROUPBOX "Opzioni",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Premere il tasto modificatore due volte per bloccarlo",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Disabilita il blocco dei tasti se due tasti sono premuti contemporaneamente",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Notifiche",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Segnalazione acustica quando viene premuto un tasto",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Mostra lo stato del blocco tasti sullo schermo",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Filter Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for FilterKeys is: \nHold down <Right Shift> for eight seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) +CAPTION "Impostazione del filtro dei tasti" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scorciatoie della tastiera",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "La scorciatoia per i filtri è: \nTenere premuto lo <Shift destro> per otto secondi.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Use shortcut",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 - GROUPBOX "Filter options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 - AUTORADIOBUTTON "Ign&ore repeated keystrokes",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP - AUTORADIOBUTTON "Ig&nore quick keystrokes and slow down the repeat rate",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE - PUSHBUTTON "&Settings",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP - PUSHBUTTON "S&ettings",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP - LTEXT "&Click here and type here to test the settings:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + GROUPBOX "Opzioni dei filtri",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 + AUTORADIOBUTTON "Ign&ora i tasti ripetuti",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP + AUTORADIOBUTTON "Ig&nora le pressioni brevi dei tasti e rallenta la ripetizione automatica",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE + PUSHBUTTON "&Impostazioni",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP + PUSHBUTTON "I&mpostazioni",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP + LTEXT "&Cliccare qui e scrivere per verificare le impostazioni:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL - GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 - AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + GROUPBOX "Notifiche",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 + AUTOCHECKBOX "&Segnale acustico quando un tasto è premuto o accettato",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + AUTOCHECKBOX "Mostra lo stato dei filtri sullo schermo",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Toggle Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +CAPTION "Impostazione dei tasti a commutazione" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scorciatoia da tastiera",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "La scorciatoia per i tasti a commutazione è: \nTenere premuto <Bloc Num> per cinque secondi.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Usare la scorciatoia",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "High Contrast Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) +CAPTION "Impostazioni per contrasto elevato" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scorciatoia da tastiera",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "La scorciatoia per contrasto elevato è: \nPremere <Alt Sinistro+Shift Sinistro+Stamp>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Usare la scorciatoia",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Schema dei colori ad alto contrasto",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Schema dei colori attuale:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Mouse Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) - - LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) - LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) +CAPTION "Impostazione dei tasti del mouse" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scorciatoia da tastiera",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "La scorciatoia per i tasti del mouse è: \nPremere <Alt Sinistro+Shift Sinistro+BlocNum>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Usare la scorciatoia",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Velocità del puntatore",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Velocità massima:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Bassa",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) - LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + LTEXT "Alta",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Accelerazione:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Lenta",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) - - AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - - AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + LTEXT "Veloce",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Tenere premuto Ctrl per accelerare, Shift per rallentare",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Usare i tasti del mouse quando BlocNum è:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "&Attivo",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "&Disattivo",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Mostra i tasti del mouse sullo schermo",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced FilterKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) +CAPTION "Impostazioni avanzate dei filtri dei tasti" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Rimbalzo dei tasti",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignora pressioni dei tasti più veloci di:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "&Area di prova:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced FilterKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) - LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) - - LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) +CAPTION "Impostazioni avanzate dei filtri dei tasti" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ripetizione dei tasti",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Sovraimponi alle impostazioni della tastiera in Pannello di Controllo:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + AUTORADIOBUTTON "&Nessuna ripetizione dei tasti",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Ridurre la velocità di ripetizione",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "&Ritardo della ripetizione:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + LTEXT "Velocità della ripetizione:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 - LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + GROUPBOX "Tasti lenti",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&I tasti devono rimanere premuti per:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "&Area di prova:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SerialKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) +CAPTION "Impostazione tasti da seriale" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tasti da seriale",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - LTEXT "&Serial port:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + LTEXT "&Porta seriale:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4)+7, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -285,20 +285,20 @@ CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Accessibility" - IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." - - IDS_SENTRY_NONE "[None]" - IDS_SENTRY_TITLE "Flash the titlebar" - IDS_SENTRY_WINDOW "Flash the active window" - IDS_SENTRY_DISPLAY "Flash the desktop" - - IDS_SECONDS "Seconds" - IDS_MINUTES "Minutes" -END + IDS_CPLSYSTEMNAME "Accessibilità" + IDS_CPLSYSTEMDESCRIPTION "Personalizza le funzioni di accessibilità sul tuo computer." + + IDS_SENTRY_NONE "[Nessuna]" + IDS_SENTRY_TITLE "Lampeggiare la barra del titolo" + IDS_SENTRY_WINDOW "Lampeggiare la finestra attiva" + IDS_SENTRY_DISPLAY "Lampeggiare il desktop" + + IDS_SECONDS "Secondi" + IDS_MINUTES "Minuti" +END Modified: trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc Sun Oct 7 19:38:04 2007 @@ -110,8 +110,8 @@ STRINGTABLE BEGIN - IDS_ASSIGNED_DHCP "Assigned by DHCP" - IDS_ASSIGNED_MANUAL "Manually configured" + IDS_ASSIGNED_DHCP "Assegnato da DHCP" + IDS_ASSIGNED_MANUAL "Configurato manualmente" END STRINGTABLE @@ -123,13 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Impossibile creare la pagina delle proprietà" IDS_OUT_OF_MEMORY "Memoria esaurita" IDS_CANNOT_SAVE_CHANGES "Impossibile salvare le modifiche effettuate" - IDS_STATUS_NON_OPERATIONAL "Non-operational" - IDS_STATUS_UNREACHABLE "No WAN adapter found" - IDS_STATUS_DISCONNECTED "Disconnected" - IDS_STATUS_CONNECTING "Connecting" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_STATUS_NON_OPERATIONAL "Non-operativo" + IDS_STATUS_UNREACHABLE "Nessun adattatore WAN trovato" + IDS_STATUS_DISCONNECTED "Disconnesso" + IDS_STATUS_CONNECTING "Connessione in corso" + IDS_STATUS_CONNECTED "Connesso" + IDS_STATUS_OPERATIONAL "Connesso" IDS_SPEED_MBPS "%d Mbps" - IDS_DURATION_DAY "%d day %s" - IDS_DURATION_DAYS "%d days %s" + IDS_DURATION_DAY "%d giorno %s" + IDS_DURATION_DAYS "%d giorni %s" END

1 0

[dreimer] 29438: Translate the new stuff in the German RC File and remove two wrong set spaces.
by dreimer＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: dreimer Date: Sun Oct 7 17:44:30 2007 New Revision: 29438 URL: http://svn.reactos.org/svn/reactos?rev=29438&view=rev Log: Translate the new stuff in the German RC File and remove two wrong set spaces. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Sun Oct 7 17:44:30 2007 @@ -23,7 +23,7 @@ STRINGTABLE BEGIN - MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." - MSG_FILEFAILED, "Failed to create options.cmd !" - MSG_DIREFAILED, "Failed to create log directory !" + MSG_NOGCCFOUND, "Kein GCC Compiler gefunden ! Bitte überprüfen sie ihren Pfad." + MSG_FILEFAILED, "options.cmd konnte nicht erstellt werden!" + MSG_DIREFAILED, "Log directory konnte nicht erstellt werden!" END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Sun Oct 7 17:44:30 2007 @@ -24,6 +24,6 @@ STRINGTABLE BEGIN MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." - MSG_FILEFAILED, "Failed to create options.cmd !" - MSG_DIREFAILED, "Failed to create log directory !" + MSG_FILEFAILED, "Failed to create options.cmd!" + MSG_DIREFAILED, "Failed to create log directory!" END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sun Oct 7 17:44:30 2007 @@ -24,6 +24,6 @@ STRINGTABLE BEGIN MSG_NOGCCFOUND, "Impossible de trouver le compilateur GCC ! Veuillez vérifier votre répertoire." - MSG_FILEFAILED, "Impossible de créer options.cmd !" - MSG_DIREFAILED, "Impossible de créer le répertoire pour le journal !" + MSG_FILEFAILED, "Impossible de créer options.cmd!" + MSG_DIREFAILED, "Impossible de créer le répertoire pour le journal!" END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Sun Oct 7 17:44:30 2007 @@ -24,6 +24,6 @@ STRINGTABLE BEGIN MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." - MSG_FILEFAILED, "Failed to create options.cmd !" - MSG_DIREFAILED, "Failed to create log directory !" + MSG_FILEFAILED, "Failed to create options.cmd!" + MSG_DIREFAILED, "Failed to create log directory!" END

1 0

[dreimer] 29437: Another nice Patch by Pierre Schweitzer. - Save button is disabled until a parameter is changed - Definitively fixed resources IDs - Added check to see if MingW dir is right (look up gcc) - Added check to test if log dir exists and if it doesn't, it's created - Added check to avoid writing in a non-existant file - Updated todo list
by dreimer＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: dreimer Date: Sun Oct 7 17:31:29 2007 New Revision: 29437 URL: http://svn.reactos.org/svn/reactos?rev=29437&view=rev Log: Another nice Patch by Pierre Schweitzer. - Save button is disabled until a parameter is changed - Definitively fixed resources IDs - Added check to see if MingW dir is right (look up gcc) - Added check to test if log dir exists and if it doesn't, it's created - Added check to avoid writing in a non-existant file - Updated todo list Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/resources.h trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Sun Oct 7 17:31:29 2007 @@ -4,7 +4,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" -{ +BEGIN // x, pos_hight, width, hight LTEXT "Reactos Build Environment Einstellungen", 0x0, 10, 10, 140, 13 LTEXT "Hintergrundfarbe", 0x0, 10, 35, 60, 12 @@ -17,6 +17,13 @@ PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP - PUSHBUTTON "Speichern", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Speichern", ID_OK, 63, 155, 59, 26, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP -} +END + +STRINGTABLE +BEGIN + MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." + MSG_FILEFAILED, "Failed to create options.cmd !" + MSG_DIREFAILED, "Failed to create log directory !" +END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Sun Oct 7 17:31:29 2007 @@ -4,7 +4,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Settings" FONT 8, "MS Shell Dlg" -{ +BEGIN // x, pos_hight, width, hight LTEXT "Reactos Build Environment Settings", 0x0, 10, 10, 140, 13 LTEXT "Background Color", 0x0, 10, 35, 60, 12 @@ -17,6 +17,13 @@ PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP - PUSHBUTTON "Save", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Save", ID_OK, 63, 155, 59, 26, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Cancel", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP -} +END + +STRINGTABLE +BEGIN + MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." + MSG_FILEFAILED, "Failed to create options.cmd !" + MSG_DIREFAILED, "Failed to create log directory !" +END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sun Oct 7 17:31:29 2007 @@ -4,19 +4,26 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paramètre du RosBE" FONT 8, "MS Shell Dlg" -{ +BEGIN // x, pos_hight, width, hight - LTEXT "Paramètres de l'Environnement de Compilation de ReactOS", 0x0, 10, 10, 140, 13 - LTEXT "Couleur d'arrière plan", 0x0, 10, 35, 60, 12 + LTEXT "Paramètres de l'Environnement de Compilation de ReactOS", 0x0, 10, 10, 240, 15 + LTEXT "Couleur d'arrière plan", 0x0, 10, 35, 60, 17 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Couleur de la police", 0x0, 10, 60, 60, 12 + LTEXT "Couleur de la police", 0x0, 10, 60, 60, 17 COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 - CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 + CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 21 + CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 85, 85, 21 EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP - PUSHBUTTON "Sauvegarder", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Sauvegarder", ID_OK, 63, 155, 59, 26, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Annuler", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP -} +END + +STRINGTABLE +BEGIN + MSG_NOGCCFOUND, "Impossible de trouver le compilateur GCC ! Veuillez vérifier votre répertoire." + MSG_FILEFAILED, "Impossible de créer options.cmd !" + MSG_DIREFAILED, "Impossible de créer le répertoire pour le journal !" +END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Sun Oct 7 17:31:29 2007 @@ -4,7 +4,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè RosBE" FONT 8, "MS Shell Dlg" -{ +BEGIN // x, pos_hight, width, hight LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 140, 13 LTEXT "Öâåò Ôîíà", 0x0, 10, 35, 60, 12 @@ -17,6 +17,13 @@ PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 155, 59, 26, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP -} +END + +STRINGTABLE +BEGIN + MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." + MSG_FILEFAILED, "Failed to create options.cmd !" + MSG_DIREFAILED, "Failed to create log directory !" +END Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sun Oct 7 17:31:29 2007 @@ -35,12 +35,15 @@ HINSTANCE hInstance; -VOID +INT WriteSettings(HWND hwnd) { int foreground, background; BOOL showtime, writelog; - WCHAR logpath[MAX_PATH], mingwpath[MAX_PATH]; + WCHAR logpath[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH]; + WCHAR msgerror[256]; + HANDLE hFile; + FILE *pFile; showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; @@ -49,16 +52,56 @@ GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); - FILE *pFile = fopen("options.cmd", "w"); - - fprintf(pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); - fprintf(pFile, "color %X%X\n", background, foreground); - fprintf(pFile, "set ROSBE_SHOWTIME=%d\n", showtime); - fprintf(pFile, "set ROSBE_WRITELOG=%d\n", writelog); - fprintf(pFile, "set ROSBE_LOGPATH=%S\n", logpath); - fprintf(pFile, "set ROSBE_MINGWPATH=%S\n", mingwpath); - - fclose(pFile); + if (writelog) + { + GetCurrentDirectory(MAX_PATH, checklog); + if (SetCurrentDirectory(logpath)) + { + SetCurrentDirectory(checklog); + } + else + { + if (!CreateDirectory(logpath, NULL)) + { + LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); + MessageBox(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; + } + } + } + + wcscpy(checkmgw, mingwpath); + wcscat(checkmgw, L"\\bin\\gcc.exe"); + hFile = CreateFile(checkmgw, (INT)NULL, (INT)NULL, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + LoadString(hInstance, MSG_NOGCCFOUND, msgerror, 256); + MessageBox(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; + } + else + { + CloseHandle(hFile); + } + + pFile = fopen("options.cmd", "w"); + if (pFile) + { + fprintf(pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); + fprintf(pFile, "color %X%X\n", background, foreground); + fprintf(pFile, "set ROSBE_SHOWTIME=%d\n", showtime); + fprintf(pFile, "set ROSBE_WRITELOG=%d\n", writelog); + fprintf(pFile, "set ROSBE_LOGPATH=%S\n", logpath); + fprintf(pFile, "set ROSBE_MINGWPATH=%S\n", mingwpath); + fclose(pFile); + return TRUE; + } + else + { + LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); + MessageBox(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; + } } INT_PTR CALLBACK @@ -102,7 +145,7 @@ } else if (wParam == ID_OK) { - WriteSettings(Dlg); + if (WriteSettings(Dlg)) PostMessage(Dlg, WM_CLOSE, 0, 0); } else if (wParam == ID_BROWSE) @@ -114,7 +157,10 @@ PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); if (pidl && SHGetPathFromIDList(pidl, Path)) + { SetDlgItemText(Dlg, ID_LOGDIR, Path); + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + } } else if (wParam == ID_BROWSEMGW) { @@ -135,7 +181,10 @@ PathInfo.lpszTitle = L"Please choose the directory where MingW is located:"; LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); if (pidl && SHGetPathFromIDList(pidl, MGWPath)) + { SetDlgItemText(Dlg, ID_MGWDIR, MGWPath); + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + } } else if (wParam == ID_SAVELOGS) { @@ -144,6 +193,10 @@ EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); } + else if ((wParam == ID_SHOWBUILDTIME) || ((LOWORD(wParam) == IDC_FONT) && (HIWORD(wParam) == CBN_SELCHANGE)) || ((LOWORD(wParam) == IDC_BACK) && (HIWORD(wParam) == CBN_SELCHANGE))) + { + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + } return FALSE; } Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Sun Oct 7 17:31:29 2007 @@ -1,3 +1,4 @@ +/* Controls */ #define ID_OK 0x1 #define ID_CANCEL 0x2 #define ID_OPTICON 0x3 @@ -7,7 +8,12 @@ #define ID_BROWSE 0x7 #define ID_MGWDIR 0x8 #define ID_BROWSEMGW 0x9 -#define ID_DIALOG 0x10 -#define IDC_FONT 0x1 -#define IDC_BACK 0x2 +#define ID_DIALOG 0xa +#define IDC_FONT 0xb +#define IDC_BACK 0xc +/* Strings */ +#define MSG_NOGCCFOUND 0x50 +#define MSG_FILEFAILED 0x51 +#define MSG_DIREFAILED 0x52 + Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Sun Oct 7 17:31:29 2007 @@ -1,5 +1,5 @@ ToDo: - Load old settings -- Disable Save button if there are no changes -- Check validity of log path before saving +- Improve Save button status (disabled if no changes, even if user played with param) - Font preview +- Fix FIXME

1 0

[fireball] 29436: - Inspired by 22169: * Update GetRegistryPath * Get SetupDevMode from trunk's 29435 dc.c * Copy GetVideoDeviceName and IntChangeDisplaySettings from trunk's 29435 dc.c - This solves the weird font + video mode issues (vmware video driver, for example) in this branch.
by fireball＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: fireball Date: Sun Oct 7 17:11:34 2007 New Revision: 29436 URL: http://svn.reactos.org/svn/reactos?rev=29436&view=rev Log: - Inspired by 22169: * Update GetRegistryPath * Get SetupDevMode from trunk's 29435 dc.c * Copy GetVideoDeviceName and IntChangeDisplaySettings from trunk's 29435 dc.c - This solves the weird font + video mode issues (vmware video driver, for example) in this branch. Modified: branches/win32k-stable/reactos/subsystems/win32/win32k/objects/dc.c Modified: branches/win32k-stable/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-stable/reactos/subsystem… ============================================================================== --- branches/win32k-stable/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ branches/win32k-stable/reactos/subsystems/win32/win32k/objects/dc.c Sun Oct 7 17:11:34 2007 @@ -264,14 +264,14 @@ return hNewDC; } -static BOOL FASTCALL +static BOOLEAN FASTCALL GetRegistryPath(PUNICODE_STRING RegistryPath, ULONG DisplayNumber) { RTL_QUERY_REGISTRY_TABLE QueryTable[2]; WCHAR DeviceNameBuffer[20]; NTSTATUS Status; - swprintf(DeviceNameBuffer, L"\\Device\\Video%d", DisplayNumber); + swprintf(DeviceNameBuffer, L"\\Device\\Video%lu", DisplayNumber); RtlInitUnicodeString(RegistryPath, NULL); RtlZeroMemory(QueryTable, sizeof(QueryTable)); QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED | RTL_QUERY_REGISTRY_DIRECT; @@ -285,11 +285,11 @@ NULL); if (! NT_SUCCESS(Status)) { - DPRINT1("No \\Device\\Video%d value in DEVICEMAP\\VIDEO found\n", DisplayNumber); + DPRINT1("No \\Device\\Video%lu value in DEVICEMAP\\VIDEO found\n", DisplayNumber); return FALSE; } - DPRINT("RegistryPath %S\n", RegistryPath->Buffer); + DPRINT("RegistryPath %wZ\n", RegistryPath); return TRUE; } @@ -380,103 +380,48 @@ static BOOL FASTCALL SetupDevMode(PDEVMODEW DevMode, ULONG DisplayNumber) { - static WCHAR RegistryMachineSystem[] = L"\\REGISTRY\\MACHINE\\SYSTEM\\"; - static WCHAR CurrentControlSet[] = L"CURRENTCONTROLSET\\"; - static WCHAR ControlSet[] = L"CONTROLSET"; - static WCHAR Insert[] = L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; UNICODE_STRING RegistryPath; - BOOL Valid; - PWCHAR AfterControlSet; - PWCHAR ProfilePath; RTL_QUERY_REGISTRY_TABLE QueryTable[2]; NTSTATUS Status; - - if (! GetRegistryPath(&RegistryPath, DisplayNumber)) + BOOLEAN Valid = TRUE; + + if (!GetRegistryPath(&RegistryPath, DisplayNumber)) { DPRINT("GetRegistryPath failed\n"); return FALSE; } - Valid = (0 == _wcsnicmp(RegistryPath.Buffer, RegistryMachineSystem, - wcslen(RegistryMachineSystem))); - if (Valid) - { - AfterControlSet = RegistryPath.Buffer + wcslen(RegistryMachineSystem); - if (0 == _wcsnicmp(AfterControlSet, CurrentControlSet, wcslen(CurrentControlSet))) + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].QueryRoutine = DevModeCallback; + QueryTable[0].Flags = 0; + QueryTable[0].Name = NULL; + QueryTable[0].EntryContext = NULL; + QueryTable[0].DefaultType = REG_NONE; + QueryTable[0].DefaultData = NULL; + QueryTable[0].DefaultLength = 0; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + RegistryPath.Buffer, + QueryTable, + DevMode, + NULL); + if (! NT_SUCCESS(Status)) + { + DPRINT("RtlQueryRegistryValues for %wZ failed with status 0x%08x\n", + &RegistryPath, Status); + Valid = FALSE; + } + else + { + DPRINT("dmBitsPerPel %d dmDisplayFrequency %d dmPelsWidth %d dmPelsHeight %d\n", + DevMode->dmBitsPerPel, DevMode->dmDisplayFrequency, + DevMode->dmPelsWidth, DevMode->dmPelsHeight); + if (0 == DevMode->dmBitsPerPel || 0 == DevMode->dmDisplayFrequency + || 0 == DevMode->dmPelsWidth || 0 == DevMode->dmPelsHeight) { - AfterControlSet += wcslen(CurrentControlSet); - } - else if (0 == _wcsnicmp(AfterControlSet, ControlSet, wcslen(ControlSet))) - { - AfterControlSet += wcslen(ControlSet); - while (L'0' <= *AfterControlSet && L'9' <= *AfterControlSet) - { - AfterControlSet++; - } - Valid = (L'\\' == *AfterControlSet); - AfterControlSet++; - } - else - { + DPRINT("Not all required devmode members are set\n"); Valid = FALSE; } - } - - if (Valid) - { - ProfilePath = ExAllocatePoolWithTag(PagedPool, - (wcslen(RegistryPath.Buffer) + - wcslen(Insert) + 1) * sizeof(WCHAR), - TAG_DC); - if (NULL != ProfilePath) - { - wcsncpy(ProfilePath, RegistryPath.Buffer, AfterControlSet - RegistryPath.Buffer); - wcscpy(ProfilePath + (AfterControlSet - RegistryPath.Buffer), Insert); - wcscat(ProfilePath, AfterControlSet); - - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - QueryTable[0].QueryRoutine = DevModeCallback; - QueryTable[0].Flags = 0; - QueryTable[0].Name = NULL; - QueryTable[0].EntryContext = NULL; - QueryTable[0].DefaultType = REG_NONE; - QueryTable[0].DefaultData = NULL; - QueryTable[0].DefaultLength = 0; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - ProfilePath, - QueryTable, - DevMode, - NULL); - if (! NT_SUCCESS(Status)) - { - DPRINT("RtlQueryRegistryValues for %S failed with status 0x%08x\n", - ProfilePath, Status); - Valid = FALSE; - } - else - { - DPRINT("dmBitsPerPel %d dmDisplayFrequency %d dmPelsWidth %d dmPelsHeight %d\n", - DevMode->dmBitsPerPel, DevMode->dmDisplayFrequency, - DevMode->dmPelsWidth, DevMode->dmPelsHeight); - if (0 == DevMode->dmBitsPerPel || 0 == DevMode->dmDisplayFrequency - || 0 == DevMode->dmPelsWidth || 0 == DevMode->dmPelsHeight) - { - DPRINT("Not all required devmode members are set\n"); - Valid = FALSE; - } - } - - ExFreePool(ProfilePath); - } - else - { - Valid = FALSE; - } - } - else - { - DPRINT1("Unparsable registry path %S in DEVICEMAP\\VIDEO0", RegistryPath.Buffer); } RtlFreeUnicodeString(&RegistryPath); @@ -2721,6 +2666,137 @@ return TRUE; } + +static NTSTATUS FASTCALL +GetVideoDeviceName( + OUT PUNICODE_STRING VideoDeviceName, + IN PCUNICODE_STRING DisplayDevice) /* ex: "\.\DISPLAY1" or "\??\DISPLAY1" */ +{ + UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\??\\"); + UNICODE_STRING ObjectName; + UNICODE_STRING KernelModeName = { 0, }; + OBJECT_ATTRIBUTES ObjectAttributes; + USHORT LastSlash; + ULONG Length; + HANDLE LinkHandle = NULL; + NTSTATUS Status; + + RtlInitUnicodeString(VideoDeviceName, NULL); + + /* Get device name (DisplayDevice is "\.\xxx") */ + for (LastSlash = DisplayDevice->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) + { + if (DisplayDevice->Buffer[LastSlash - 1] == L'\\') + break; + } + + if (LastSlash == 0) + { + DPRINT1("Invalid device name '%wZ'\n", DisplayDevice); + Status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } + ObjectName = *DisplayDevice; + ObjectName.Length -= LastSlash * sizeof(WCHAR); + ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); + ObjectName.Buffer += LastSlash; + + /* Create "\??\xxx" (ex: "\??\DISPLAY1") */ + KernelModeName.MaximumLength = Prefix.Length + ObjectName.Length + sizeof(UNICODE_NULL); + KernelModeName.Buffer = ExAllocatePoolWithTag(PagedPool, + KernelModeName.MaximumLength, + TAG_DC); + if (!KernelModeName.Buffer) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + RtlCopyUnicodeString(&KernelModeName, &Prefix); + Status = RtlAppendUnicodeStringToString(&KernelModeName, &ObjectName); + if (!NT_SUCCESS(Status)) + goto cleanup; + + /* Open \??\xxx (ex: "\??\DISPLAY1") */ + InitializeObjectAttributes(&ObjectAttributes, + &KernelModeName, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + GENERIC_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to open symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + + Status = ZwQuerySymbolicLinkObject(LinkHandle, VideoDeviceName, &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT1("Unable to query symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + VideoDeviceName->MaximumLength = Length; + VideoDeviceName->Buffer = ExAllocatePoolWithTag(PagedPool, + VideoDeviceName->MaximumLength + sizeof(UNICODE_NULL), + TAG_DC); + if (!VideoDeviceName->Buffer) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = ZwQuerySymbolicLinkObject(LinkHandle, VideoDeviceName, NULL); + VideoDeviceName->Buffer[VideoDeviceName->MaximumLength / sizeof(WCHAR) - 1] = UNICODE_NULL; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to query symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + Status = STATUS_SUCCESS; + +cleanup: + if (!NT_SUCCESS(Status) && VideoDeviceName->Buffer) + ExFreePoolWithTag(VideoDeviceName->Buffer, TAG_DC); + if (KernelModeName.Buffer) + ExFreePoolWithTag(KernelModeName.Buffer, TAG_DC); + if (LinkHandle) + ZwClose(LinkHandle); + return Status; +} + +static NTSTATUS FASTCALL +GetVideoRegistryKey( + OUT PUNICODE_STRING RegistryPath, + IN PCUNICODE_STRING DeviceName) /* ex: "\Device\Video0" */ +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + RtlInitUnicodeString(RegistryPath, NULL); + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED | RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].Name = DeviceName->Buffer; + QueryTable[0].EntryContext = RegistryPath; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, + L"VIDEO", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No %wZ value in DEVICEMAP\\VIDEO found (Status 0x%08lx)\n", DeviceName, Status); + return STATUS_NO_SUCH_DEVICE; + } + + DPRINT("RegistryPath %wZ\n", RegistryPath); + return STATUS_SUCCESS; +} + LONG FASTCALL IntChangeDisplaySettings( @@ -2736,7 +2812,7 @@ LONG Ret=0; NTSTATUS Status ; - DPRINT1("display flag : %x\n",dwflags); + DPRINT1("display flags : %x\n",dwflags); if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) { @@ -2759,7 +2835,7 @@ if (dwflags == 0) { /* Dynamically change graphics mode */ - DPRINT1("flag 0 UNIMPLEMENT \n"); + DPRINT1("flag 0 UNIMPLEMENTED\n"); return DISP_CHANGE_FAILED; } @@ -2767,26 +2843,23 @@ { /* Test reslution */ dwflags &= ~CDS_TEST; - DPRINT1("flag CDS_TEST UNIMPLEMENT"); + DPRINT1("flag CDS_TEST UNIMPLEMENTED\n"); Ret = DISP_CHANGE_FAILED; } - + if ((dwflags & CDS_FULLSCREEN) == CDS_FULLSCREEN) { - DEVMODE lpDevMode; + DEVMODEW lpDevMode; /* Full Screen */ dwflags &= ~CDS_FULLSCREEN; - DPRINT1("flag CDS_FULLSCREEN partially implemented"); + DPRINT1("flag CDS_FULLSCREEN partially implemented\n"); Ret = DISP_CHANGE_FAILED; - lpDevMode.dmBitsPerPel =0; - lpDevMode.dmPelsWidth =0; - lpDevMode.dmPelsHeight =0; - lpDevMode.dmDriverExtra =0; - - lpDevMode.dmSize = sizeof(DEVMODE); - Status = IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0); - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; + RtlZeroMemory(&lpDevMode, sizeof(DEVMODEW)); + lpDevMode.dmSize = sizeof(DEVMODEW); + + if (!IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0)) + return DISP_CHANGE_FAILED; DPRINT1("Req Mode : %d x %d x %d\n", DevMode->dmPelsWidth,DevMode->dmPelsHeight,DevMode->dmBitsPerPel); DPRINT1("Current Mode : %d x %d x %d\n", lpDevMode.dmPelsWidth,lpDevMode.dmPelsHeight, lpDevMode.dmBitsPerPel); @@ -2795,148 +2868,126 @@ if ((lpDevMode.dmBitsPerPel == DevMode->dmBitsPerPel) && (lpDevMode.dmPelsWidth == DevMode->dmPelsWidth) && (lpDevMode.dmPelsHeight == DevMode->dmPelsHeight)) - Ret = DISP_CHANGE_SUCCESSFUL; + Ret = DISP_CHANGE_SUCCESSFUL; } if ((dwflags & CDS_VIDEOPARAMETERS) == CDS_VIDEOPARAMETERS) - { + { dwflags &= ~CDS_VIDEOPARAMETERS; - if (lParam == NULL) Ret=DISP_CHANGE_BADPARAM; - else - { - DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); - Ret = DISP_CHANGE_FAILED; - } - - } + if (lParam == NULL) + Ret=DISP_CHANGE_BADPARAM; + else + { + DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENTED\n"); + Ret = DISP_CHANGE_FAILED; + } + + } if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) - { - - UNICODE_STRING ObjectName; - UNICODE_STRING KernelModeName; - WCHAR KernelModeNameBuffer[256]; - UNICODE_STRING RegistryKey; - WCHAR RegistryKeyBuffer[512]; - PDEVICE_OBJECT DeviceObject; - ULONG LastSlash; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE DevInstRegKey; - ULONG NewValue; - - - DPRINT1("set CDS_UPDATEREGISTRY \n"); - - dwflags &= ~CDS_UPDATEREGISTRY; - - /* Get device name (pDeviceName is "\.\xxx") */ - for (LastSlash = pDeviceName->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) - { - if (pDeviceName->Buffer[LastSlash - 1] == L'\\') - break; - } - - if (LastSlash == 0) return DISP_CHANGE_RESTART; - ObjectName = *pDeviceName; - ObjectName.Length -= LastSlash * sizeof(WCHAR); - ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); - ObjectName.Buffer += LastSlash; - - KernelModeName.Length = 0; - KernelModeName.MaximumLength = sizeof(KernelModeNameBuffer); - KernelModeName.Buffer = KernelModeNameBuffer; - - /* Open \??\xxx (ex: "\??\DISPLAY1") */ - Status = RtlAppendUnicodeToString(&KernelModeName, L"\\??\\"); - - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; - Status = RtlAppendUnicodeStringToString(&KernelModeName, &ObjectName); - - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; - Status = ObReferenceObjectByName( - &KernelModeName, - OBJ_CASE_INSENSITIVE, - NULL, - 0, - IoDeviceObjectType, - KernelMode, - NULL, - (PVOID*)&DeviceObject); - - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; - /* Get associated driver name (ex: "VBE") */ - for (LastSlash = DeviceObject->DriverObject->DriverName.Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) - { - if (DeviceObject->DriverObject->DriverName.Buffer[LastSlash - 1] == L'\\') - break; - } - - if (LastSlash == 0) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } - ObjectName = DeviceObject->DriverObject->DriverName; - ObjectName.Length -= LastSlash * sizeof(WCHAR); - ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); - ObjectName.Buffer += LastSlash; - - RegistryKey.Length = 0; - RegistryKey.MaximumLength = sizeof(RegistryKeyBuffer); - RegistryKey.Buffer = RegistryKeyBuffer; - - /* Open registry key */ - Status = RtlAppendUnicodeToString(&RegistryKey, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\"); - - if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } - Status = RtlAppendUnicodeStringToString(&RegistryKey, &ObjectName); - - if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } - Status = RtlAppendUnicodeToString(&RegistryKey, - L"\\Device0"); - - if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } - - InitializeObjectAttributes(&ObjectAttributes, &RegistryKey, - OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&DevInstRegKey, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes); - ObDereferenceObject(DeviceObject); - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; - - /* Update needed fields */ - if (NT_SUCCESS(Status) && DevMode->dmFields & DM_BITSPERPEL) - { - RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.BitsPerPel"); - NewValue = DevMode->dmBitsPerPel; - Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); - } - - if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSWIDTH) - { - RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.XResolution"); - NewValue = DevMode->dmPelsWidth; - Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); - } - - if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSHEIGHT) - { - RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.YResolution"); - NewValue = DevMode->dmPelsHeight; - Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); - } - - ZwClose(DevInstRegKey); - if (NT_SUCCESS(Status)) - Ret = DISP_CHANGE_RESTART; - else - /* return DISP_CHANGE_NOTUPDATED when we can save to reg only vaild for NT */ - Ret = DISP_CHANGE_NOTUPDATED; - - } - - if (dwflags != 0) + { + + UNICODE_STRING DeviceName; + UNICODE_STRING RegistryKey; + UNICODE_STRING InDeviceName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DevInstRegKey; + ULONG NewValue; + + DPRINT1("set CDS_UPDATEREGISTRY\n"); + + dwflags &= ~CDS_UPDATEREGISTRY; + + /* Check if pDeviceName is NULL, we need to retrieve it */ + if (pDeviceName == NULL) + { + WCHAR szBuffer[MAX_DRIVER_NAME]; + PDC DC; + PWINDOW_OBJECT Wnd=NULL; + HWND hWnd; + HDC hDC; + + hWnd = IntGetDesktopWindow(); + if (!(Wnd = UserGetWindowObject(hWnd))) + { + return FALSE; + } + + hDC = (HDC)UserGetWindowDC(Wnd); + + DC = DC_LockDc(hDC); + if (NULL == DC) + { + return FALSE; + } + swprintf (szBuffer, L"\\\\.\\DISPLAY%lu", ((GDIDEVICE *)DC->GDIDevice)->DisplayNumber); + DC_UnlockDc(DC); + + RtlInitUnicodeString(&InDeviceName, szBuffer); + pDeviceName = &InDeviceName; + } + + Status = GetVideoDeviceName(&DeviceName, pDeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to get destination of '%wZ' (Status 0x%08lx)\n", pDeviceName, Status); + return DISP_CHANGE_FAILED; + } + Status = GetVideoRegistryKey(&RegistryKey, &DeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to get registry key for '%wZ' (Status 0x%08lx)\n", &DeviceName, Status); + ExFreePoolWithTag(DeviceName.Buffer, TAG_DC); + return DISP_CHANGE_FAILED; + } + ExFreePoolWithTag(DeviceName.Buffer, TAG_DC); + + InitializeObjectAttributes(&ObjectAttributes, &RegistryKey, + OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&DevInstRegKey, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to open registry key %wZ (Status 0x%08lx)\n", &RegistryKey, Status); + ExFreePoolWithTag(RegistryKey.Buffer, TAG_DC); + return DISP_CHANGE_FAILED; + } + ExFreePoolWithTag(RegistryKey.Buffer, TAG_DC); + + /* Update needed fields */ + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_BITSPERPEL) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.BitsPerPel"); + NewValue = DevMode->dmBitsPerPel; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSWIDTH) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.XResolution"); + NewValue = DevMode->dmPelsWidth; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSHEIGHT) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.YResolution"); + NewValue = DevMode->dmPelsHeight; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + ZwClose(DevInstRegKey); + if (NT_SUCCESS(Status)) + Ret = DISP_CHANGE_RESTART; + else + /* return DISP_CHANGE_NOTUPDATED when we can save to reg only valid for NT */ + Ret = DISP_CHANGE_NOTUPDATED; + } + + if (dwflags != 0) Ret = DISP_CHANGE_BADFLAGS; return Ret; } - NTSTATUS APIENTRY

1 0

[hpoussin] 29435: Oops, forgot to save the file before committing ; )
by hpoussin＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: hpoussin Date: Sun Oct 7 16:29:46 2007 New Revision: 29435 URL: http://svn.reactos.org/svn/reactos?rev=29435&view=rev Log: Oops, forgot to save the file before committing ;) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Oct 7 16:29:46 2007 @@ -2777,7 +2777,8 @@ if ( module.type != Win32DLL && module.type != Win32OCX && module.type != Win32CUI - && module.type != Win32GUI ) + && module.type != Win32GUI + && module.type != Win32SCR ) { // no implicit libraries return;

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