Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 21766: Add some checking
by gvg＠svn.reactos.org 02 May '06

02 May '06

Author: gvg Date: Tue May 2 11:13:18 2006 New Revision: 21766 URL: http://svn.reactos.ru/svn/reactos?rev=21766&view=rev Log: Add some checking Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/u… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php Tue May 2 11:13:18 2006 @@ -90,11 +90,10 @@ if (!$save_account_noses) { $save_account_noses = "false"; } - + $content_posta="UPDATE `users` SET ". $new_pwd ." `user_timestamp_touch2` = NOW( ) , `user_fullname` = '". mysql_real_escape_string($save_account_fullname) ."', - `user_email` = '". mysql_real_escape_string($save_account_email) ."', `user_website` = '". mysql_real_escape_string($save_account_hp) ."', `user_language` = '". mysql_real_escape_string($save_account_txt_langa) ."', `user_country` = '". mysql_real_escape_string($save_account_country) ."', @@ -104,8 +103,17 @@ `user_setting_multisession` = '". mysql_real_escape_string($save_account_multi) ."', `user_setting_browseragent` = '". mysql_real_escape_string($save_account_brows) ."', `user_setting_ipaddress` = '". mysql_real_escape_string($save_account_ipadd) ."', - `user_setting_timeout` = '". mysql_real_escape_string($save_account_noses) ."' - WHERE `user_id` ='". mysql_real_escape_string($roscms_intern_account_id) ."' LIMIT 1 ;"; + `user_setting_timeout` = '". mysql_real_escape_string($save_account_noses) . "'"; + + if (! preg_match('/^[\\w\\.\\+\\-=]+(a)[\\w\\.-]+\\.[\\w\\-]+$/', + $save_account_email)) { + echo '<p><font color="#FF0000">The email address ' . + htmlspecialchars($save_account_email) . + " is not valid.</font></p><br>\n"; + } else { + $content_posta .= ", `user_email` = '". mysql_real_escape_string($save_account_email) . "'"; + } + $content_posta .= " WHERE `user_id` ='". mysql_real_escape_string($roscms_intern_account_id) . "'"; $content_post_lista=mysql_query($content_posta); subsys_update_user($roscms_intern_account_id); }

1 0

[gvg] 21765: Adapt RosCms/Bugzilla interface to changed Bugzilla database scheme
by gvg＠svn.reactos.org 01 May '06

01 May '06

Author: gvg Date: Tue May 2 01:59:10 2006 New Revision: 21765 URL: http://svn.reactos.ru/svn/reactos?rev=21765&view=rev Log: Adapt RosCms/Bugzilla interface to changed Bugzilla database scheme Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_bugzilla.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_bugzilla.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/s… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_bugzilla.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_bugzilla.php Tue May 2 01:59:10 2006 @@ -35,6 +35,50 @@ require_once("subsys_utils.php"); define('SUBSYS_BUGZILLA_DBNAME', "bugs"); + +/* These constants are defined in bugzilla/Bugzilla/Constants.pm. + * We can't define arrays, so we just use a regular variable for them */ + +define('BUGZILLA_REL_ASSIGNEE', 0); +define('BUGZILLA_REL_QA', 1); +define('BUGZILLA_REL_REPORTER', 2); +define('BUGZILLA_REL_CC', 3); +define('BUGZILLA_REL_VOTER', 4); + +$bugzilla_relationships = array(BUGZILLA_REL_ASSIGNEE, BUGZILLA_REL_QA, + BUGZILLA_REL_REPORTER, BUGZILLA_REL_CC, + BUGZILLA_REL_VOTER); + +define('BUGZILLA_REL_ANY', 100); + +define('BUGZILLA_EVT_OTHER', 0); +define('BUGZILLA_EVT_ADDED_REMOVED', 1); +define('BUGZILLA_EVT_COMMENT', 2); +define('BUGZILLA_EVT_ATTACHMENT', 3); +define('BUGZILLA_EVT_ATTACHMENT_DATA', 4); +define('BUGZILLA_EVT_PROJ_MANAGEMENT', 5); +define('BUGZILLA_EVT_OPENED_CLOSED', 6); +define('BUGZILLA_EVT_KEYWORD', 7); +define('BUGZILLA_EVT_CC', 8); + +$bugzilla_pos_events = array(BUGZILLA_EVT_OTHER, BUGZILLA_EVT_ADDED_REMOVED, + BUGZILLA_EVT_COMMENT, BUGZILLA_EVT_ATTACHMENT, + BUGZILLA_EVT_ATTACHMENT_DATA, + BUGZILLA_EVT_PROJ_MANAGEMENT, + BUGZILLA_EVT_OPENED_CLOSED, BUGZILLA_EVT_KEYWORD, + BUGZILLA_EVT_CC); + +define('BUGZILLA_EVT_UNCONFIRMED', 50); +define('BUGZILLA_EVT_CHANGED_BY_ME', 51); + +$bugzilla_neg_events = array(BUGZILLA_EVT_UNCONFIRMED, + BUGZILLA_EVT_CHANGED_BY_ME); + +define('BUGZILLA_EVT_FLAG_REQUESTED', 100); # Flag has been requested of me +define('BUGZILLA_EVT_REQUESTED_FLAG', 101); # I have requested a flag + +$bugzilla_global_events = array(BUGZILLA_EVT_FLAG_REQUESTED, + BUGZILLA_EVT_REQUESTED_FLAG); function subsys_bugzilla_info_check() { @@ -135,72 +179,38 @@ $roscms_user_name, $roscms_user_email) { - /* These default settings were taken from bugzilla/Bugzilla/Constants.pm, - DEFAULT_EMAIL_SETTINGS */ - $default_email_settings = "ExcludeSelf~on" . - - "~FlagRequestee~on" . - "~FlagRequester~on" . - - "~emailOwnerRemoveme~on" . - "~emailOwnerComments~on" . - "~emailOwnerAttachments~on" . - "~emailOwnerStatus~on" . - "~emailOwnerResolved~on" . - "~emailOwnerKeywords~on" . - "~emailOwnerCC~on" . - "~emailOwnerOther~on" . - "~emailOwnerUnconfirmed~on" . - - "~emailReporterRemoveme~on" . - "~emailReporterComments~on" . - "~emailReporterAttachments~on" . - "~emailReporterStatus~on" . - "~emailReporterResolved~on" . - "~emailReporterKeywords~on" . - "~emailReporterCC~" . - "~emailReporterOther~on" . - "~emailReporterUnconfirmed~on" . - - "~emailQAcontactRemoveme~on" . - "~emailQAcontactComments~on" . - "~emailQAcontactAttachments~on" . - "~emailQAcontactStatus~on" . - "~emailQAcontactResolved~on" . - "~emailQAcontactKeywords~on" . - "~emailQAcontactCC~" . - "~emailQAcontactOther~on" . - "~emailQAcontactUnconfirmed~on" . - - "~emailCClistRemoveme~on" . - "~emailCClistComments~on" . - "~emailCClistAttachments~on" . - "~emailCClistStatus~on" . - "~emailCClistResolved~on" . - "~emailCClistKeywords~on" . - "~emailCClistCC~" . - "~emailCClistOther~on" . - "~emailCClistUnconfirmed~on" . - - "~emailVoterRemoveme~on" . - "~emailVoterComments~on" . - "~emailVoterAttachments~on" . - "~emailVoterStatus~on" . - "~emailVoterResolved~on" . - "~emailVoterKeywords~on" . - "~emailVoterCC~" . - "~emailVoterOther~on" . - "~emailVoterUnconfirmed~on"; + global $bugzilla_relationships, $bugzilla_pos_events, $bugzilla_neg_events; + global $bugzilla_global_events; $query = "INSERT INTO " . SUBSYS_BUGZILLA_DBNAME . ".profiles " . - " (login_name, cryptpassword, realname, emailflags) " . + " (login_name, cryptpassword, realname) " . " VALUES ('" . mysql_real_escape_string($roscms_user_email) . "', " . "'*', " . "'" . mysql_real_escape_string($roscms_user_name) . - "', " . - "'" . $default_email_settings . "')"; + "')"; mysql_query($query) or die("DB error (subsys_bugzilla #10)"); + + /* The default email_setting was copied from bugzilla/Bugzilla/User.pm + function insert_new_user */ + foreach ($bugzilla_relationships as $rel) { + foreach (array_merge($bugzilla_pos_events, $bugzilla_neg_events) + as $event) { + if ($event != BUGZILLA_EVT_CHANGED_BY_ME && + ($event != BUGZILLA_EVT_CC || $rel == BUGZILLA_REL_REPORTER)) { + $query = "INSERT INTO " . SUBSYS_BUGZILLA_DBNAME . ".email_setting " . + "(user_id, relationship, event) " . + "VALUES (LAST_INSERT_ID(), $rel, $event)"; + mysql_query($query) or die("DB error (subsys_bugzilla #14)"); + } + } + } + foreach ($bugzilla_global_events as $event) { + $query = "INSERT INTO " . SUBSYS_BUGZILLA_DBNAME . ".email_setting " . + "(user_id, relationship, event) " . + "VALUES (LAST_INSERT_ID(), " . BUGZILLA_REL_ANY . ", $event)"; + mysql_query($query) or die("DB error (subsys_bugzilla #15)"); + } /* Finally, insert a row in the mapping table */ $query = "INSERT INTO subsys_mappings " .

1 0

[gvg] 21764: Repair a failed merge. Fixes bug 1442.
by gvg＠svn.reactos.org 01 May '06

01 May '06

Author: gvg Date: Tue May 2 01:54:11 2006 New Revision: 21764 URL: http://svn.reactos.ru/svn/reactos?rev=21764&view=rev Log: Repair a failed merge. Fixes bug 1442. Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/tem… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl Tue May 2 01:54:11 2006 @@ -74,7 +74,6 @@ <a href="/roscms/?page=register&target=%2Fbugzilla">Register a new account</a><br> [% END %] </p> - <form name="f" action="show_bug.cgi" method="get" <form id="show-bug" name="f" action="show_bug.cgi" method="get" onsubmit="QuickSearch(f.id.value); return false;"> <div>

1 0

[fireball] 21763: - Patch by Thomas Weidenmueller: Adds a workaround for buggy installshield installers (which crash without this patch) - Fixes e.g. ATI Catalyst 5.5 installer and some other
by fireball＠svn.reactos.org 01 May '06

01 May '06

Author: fireball Date: Tue May 2 01:33:26 2006 New Revision: 21763 URL: http://svn.reactos.ru/svn/reactos?rev=21763&view=rev Log: - Patch by Thomas Weidenmueller: Adds a workaround for buggy installshield installers (which crash without this patch) - Fixes e.g. ATI Catalyst 5.5 installer and some other Modified: trunk/reactos/dll/win32/kernel32/except/except.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/except/e… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Tue May 2 01:33:26 2006 @@ -115,28 +115,83 @@ DbgPrint("EDI: %.8x EFLAGS: %.8x\n", pc->Edi, pc->EFlags); } +static LONG +BasepCheckForReadOnlyResource(IN PVOID Ptr) +{ + PVOID Data; + ULONG Size, OldProtect; + MEMORY_BASIC_INFORMATION mbi; + NTSTATUS Status; + LONG Ret = EXCEPTION_CONTINUE_SEARCH; + + /* Check if it was an attempt to write to a read-only image section! */ + Status = NtQueryVirtualMemory(NtCurrentProcess(), + Ptr, + MemoryBasicInformation, + &mbi, + sizeof(mbi), + NULL); + if (NT_SUCCESS(Status) && + mbi.Protect == PAGE_READONLY && mbi.Type == MEM_IMAGE) + { + /* Attempt to treat it as a resource section. We need to + use SEH here because we don't know if it's actually a + resource mapping */ + + _SEH_TRY + { + Data = RtlImageDirectoryEntryToData(mbi.AllocationBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_RESOURCE, + &Size); + + if (Data != NULL && + (ULONG_PTR)Ptr >= (ULONG_PTR)Data && + (ULONG_PTR)Ptr < (ULONG_PTR)Data + Size) + { + /* The user tried to write into the resources. Make the page + writable... */ + Size = 1; + Status = NtProtectVirtualMemory(NtCurrentProcess(), + &Ptr, + &Size, + PAGE_READWRITE, + &OldProtect); + if (NT_SUCCESS(Status)) + { + Ret = EXCEPTION_CONTINUE_EXECUTION; + } + } + } + _SEH_HANDLE + { + } + _SEH_END; + } + + return Ret; +} + /* * @unimplemented */ LONG STDCALL UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo) { -#if 0 - DWORD RetValue; -#endif + LONG RetValue; HANDLE DebugPort = NULL; NTSTATUS ErrCode; -#if 0 if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->ExceptionInformation[0]) { - RetValue = _BasepCheckForReadOnlyResource( - ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); + /* Change the protection on some write attempts, some InstallShield setups + have this bug */ + RetValue = BasepCheckForReadOnlyResource( + (PVOID)ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); if (RetValue == EXCEPTION_CONTINUE_EXECUTION) return EXCEPTION_CONTINUE_EXECUTION; } -#endif /* Is there a debugger running ? */ ErrCode = NtQueryInformationProcess(NtCurrentProcess(), ProcessDebugPort,

1 0

[gvg] 21762: Fix URL. Patch by Sylvain Petreolle <spetreolle@yahoo.fr>
by gvg＠svn.reactos.org 01 May '06

01 May '06

Author: gvg Date: Mon May 1 21:46:31 2006 New Revision: 21762 URL: http://svn.reactos.ru/svn/reactos?rev=21762&view=rev Log: Fix URL. Patch by Sylvain Petreolle <spetreolle(a)yahoo.fr> Modified: trunk/web/reactos.org/scripts/RosResCheck.pl Modified: trunk/web/reactos.org/scripts/RosResCheck.pl URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/scripts/RosResCheck… ============================================================================== --- trunk/web/reactos.org/scripts/RosResCheck.pl (original) +++ trunk/web/reactos.org/scripts/RosResCheck.pl Mon May 1 21:46:31 2006 @@ -46,7 +46,7 @@ my $path = "$dir/$file"; $path =~ s/^\.\///; - my $url = "http://svn.reactos.org/viewcvs/trunk/reactos/$path"; + my $url = "http://svn.reactos.org/viewcvs/reactos/trunk/reactos/$path"; print "<tr>\n"; print "<td><a href='$url'>$path</a></td>\n";

1 0

[cwittich] 21761: updated resource files
by cwittich＠svn.reactos.org 01 May '06

01 May '06

Author: cwittich Date: Mon May 1 21:24:38 2006 New Revision: 21761 URL: http://svn.reactos.ru/svn/reactos?rev=21761&view=rev Log: updated resource files Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/sv.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Mon May 1 21:24:38 2006 @@ -28,30 +28,28 @@ BEGIN GROUPBOX "É&cran de veille",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Liste des écrans de veille:",IDC_STATIC,13, 24, 71, 9 + LTEXT "Liste des écrans de veille:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Supprimer",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Ajouter",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "Paramè&tres...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "&Aperçu",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "Paramè&tres...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "&Aperçu",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "À la reprise, protéger par mot de passe",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "Dé&lai:",IDC_STATIC,13, 110, 17, 9 + LTEXT "Dé&lai:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "Minutes avant d'afficher l'écran de veille.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "Gestion de l'alimentation du moniteur",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "Gestion de l'alimentation du moniteur",IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "Pour modifier les paramètres de l'alimentation du moniteur et économiser de l'énergie, cliquez sur Gestion de l'alimentation.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "&Gestion de l'alimentation",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "&Gestion de l'alimentation",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -84,6 +82,18 @@ PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Affichage" Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Mon May 1 21:24:38 2006 @@ -26,30 +26,28 @@ BEGIN GROUPBOX "XN[ Z[o[(&S)",IDC_SCREENS_DUMMY, 5, 7, 238, 176 - LTEXT "XN[ Z[o[Ìê:",IDC_STATIC,13, 24, 71, 9 + LTEXT "XN[ Z[o[Ìê:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "í(&D)",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "ÇÁ(&A)",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "Ýè(&T)...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "vr[(&V)",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "Ýè(&T)...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "vr[(&V)",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "ApX[hÅÛì·é(&P)",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "Ò@(&W):",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "Ò@(&W):",IDC_STATIC,13, 110, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 + WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "ªoßµ½çXN[ Z[o[ð\\¦·éB",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "j^[ÌÈdÍ@\\(&E)",IDC_SCREENS_DUMMY2,5, 186, 238, 35 + GROUPBOX "j^[ÌÈdÍ@\\(&E)",IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "j^Ìd¹Ýèð²®·éÉÍA[d¹Ýè] ðNbNµÄ¾³¢B", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "d¹Ýè(&O)",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "d¹Ýè(&O)",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -82,6 +80,18 @@ PUSHBUTTON "Ú×Ýè(&V)...",IDC_SETTINGS_ADVANCED,306,205,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "æÊ" Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Mon May 1 21:24:38 2006 @@ -26,30 +26,28 @@ BEGIN GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY, 5, 7, 238, 137 - LTEXT "Ñïèñîê çàñòàâîê:",IDC_STATIC,13, 24, 71, 9 + LTEXT "Ñïèñîê çàñòàâîê:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Óäàëèòü",IDC_SCREENS_DELETE, 190, 52, 39, 15 - PUSHBUTTON "&Äîáàâèòü",IDC_SCREENS_ADD_BUTTON, 190, 34, 39, 15 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "&Íàñòðîéêà...",IDC_SCREENS_SETTINGS,140, 124, 48, 15, WS_GROUP - PUSHBUTTON "Ïðî&ñìîòð",IDC_SCREENS_TESTSC,192, 124, 43, 15 + PUSHBUTTON "&Íàñòðîéêà...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "Ïðî&ñìîòð",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "&Çàùèòà ïàðîëåì.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 16, 121, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP, 13, 121, 119, 18 - LTEXT "&Èíòåðâàë:",IDC_STATIC, 13, 110, 32, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 48, 109, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Èíòåðâàë:",IDC_STATIC, 13, 110, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 77, 109, 12, 12 - LTEXT "ìèíóò äî îòîáðàæåíèÿ çàñòàâêè.",IDC_STATIC, 80, 111, 147, 9 + WS_BORDER | WS_GROUP, 52, 109, 12, 12 + LTEXT "ìèíóò äî îòîáðàæåíèÿ çàñòàâêè.",IDC_STATIC, 70, 111, 147, 9 - GROUPBOX "&Ýíåðãîñáåðåãàþùèå ôóíêöèè ìîíèòîðà",IDC_SCREENS_DUMMY2, 5, 144, 238, 42 + GROUPBOX "&Ýíåðãîñáåðåãàþùèå ôóíêöèè ìîíèòîðà",IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó Ïàðàìåòðû Ïèòàíèÿ.", - IDC_STATIC, 16, 156, 155, 24 - PUSHBUTTON "Ïàðàìåòðû &Ïèòàíèÿ",IDC_SCREENS_POWER_BUTTON, 160, 162, 77, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "Ïàðàìåòðû &Ïèòàíèÿ",IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -82,6 +80,18 @@ PUSHBUTTON "Äî&ïîëíèòåëüíî...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Äèñïëåé" Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Mon May 1 21:24:38 2006 @@ -26,30 +26,28 @@ BEGIN GROUPBOX "&Spoøiè obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Seznam spoøièù:",IDC_STATIC,13, 24, 71, 9 + LTEXT "Seznam spoøièù:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Pøidat",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "&Nastavení...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "&Ukázka",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Nastavení...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "&Ukázka",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "Pøi obnovení poadovat &heslo.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Èekat:",IDC_STATIC,13, 110, 17, 9 + LTEXT "&Èekat:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "Minut ne se spustí spoøiè obrazovky.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "etøení &energie monitoru",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "etøení &energie monitoru",IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "Pro monosti napájení monitoru klepnìta na tlaèítko Monosti napájení.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "M&onosti napájení",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "M&onosti napájení",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -82,6 +80,18 @@ PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Obrazovka" Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Mon May 1 21:24:38 2006 @@ -33,30 +33,28 @@ BEGIN GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 108, 9 + LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Añadir",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "Configuración...",IDC_SCREENS_SETTINGS,133, 124, 56, 12,WS_GROUP - PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "Configuración...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "Protección con &password.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Esperar:",IDC_STATIC,13, 110, 31, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,44, 108, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Esperar:",IDC_STATIC,13, 110, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,62, 108, 12, 12 - LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 110, 161, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,70, 111, 147, 9 GROUPBOX "Ahorro de energía del monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Para ajustar la configuración de energía del monitor, haga click en Energía.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Energía...",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "Energía...",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -89,6 +87,18 @@ PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Pantalla" Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Mon May 1 21:24:38 2006 @@ -26,30 +26,28 @@ BEGIN GROUPBOX "&Ðñïöýëáîç ïèüíçò",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Ëßóôá ðñïöõëÜîåùí ïèüíçò:",IDC_STATIC,13, 24, 71, 9 + LTEXT "Ëßóôá ðñïöõëÜîåùí ïèüíçò:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&ÄéáãñáöÞ",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&ÐñïóèÞêç",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "Åðéëï&ãÝò...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "Ðñï&âïëÞ",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "Åðéëï&ãÝò...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "Ðñï&âïëÞ",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "Óôçí åðáíáöïñÜ, &æÞôçóç óõíèçìáôéêïý.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&ÐåñéìÝíåôå:",IDC_STATIC,13, 110, 17, 9 + LTEXT "&ÐåñéìÝíåôå:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "ËåðôÜ ðñéí ôçí Ýíáñîç ôçò ðñïöýëáîçò ïèüíçò.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Óôïé÷åßá åîïéêïíüìçóçò åíÝñãåéáò ôçò ïèüíçò",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Óôïé÷åßá åîïéêïíüìçóçò åíÝñãåéáò ôçò ïèüíçò",IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "Ãéá íá ñõèìßóåôå ôá óôïé÷åßá åíÝñãåéáò ôçò ïèüíçò, êÜíôå êëéê óôï 'Ñõìßóåéò åíÝñãåéáò'.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "&Ñõèìßóåéò åíÝñãåéáò",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "&Ñõèìßóåéò åíÝñãåéáò",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -82,6 +80,18 @@ PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Display" Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Mon May 1 21:24:38 2006 @@ -22,24 +22,23 @@ BEGIN GROUPBOX "&Képernyõvédõ",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Képernyõvédõk listája:",IDC_STATIC,13, 24, 71, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Eltávolítás",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Hozzáadás",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + LTEXT "Képernyõvédõk listája:",IDC_STATIC,13, 24, 150, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "&Beállítások...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "E&lõzetes nézet",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Beállítások...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "E&lõzetes nézet",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "&Megszakításkor jelszóval védve.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Várakozási idõ:",IDC_STATIC,13, 110, 17, 9 + LTEXT "&Várakozási idõ:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "A képernyõvédõ elindítása ennyi perc múlva.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "A képernyõ energiaellátási lehetõségei",IDC_SCREENS_DUMMY2,5, 146, 238, 35 - LTEXT "Az energiaellátási beállítások ellenõrzéséhez kattintson az Energiaellátás gombra.", IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "E&nergiaellátás",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + GROUPBOX "A képernyõ energiaellátási lehetõségei",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + LTEXT "Az energiaellátási beállítások ellenõrzéséhez kattintson az Energiaellátás gombra.", IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "E&nergiaellátás",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -68,6 +67,18 @@ PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Képernyõ" Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Mon May 1 21:24:38 2006 @@ -26,20 +26,18 @@ BEGIN GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Lijst van de schermbeveiligingen:",IDC_STATIC,13, 24, 71, 9 + LTEXT "Lijst van de schermbeveiligingen:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Toevoegen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "&Beveiligd met wachtwoord.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "W&acht:",IDC_STATIC,13, 110, 17, 9 + LTEXT "W&acht:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | @@ -48,8 +46,8 @@ GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Klik op Instellingen om de energiebesparende mogelijkheden van de monitor in te stellen.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 19 + PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -82,6 +80,18 @@ PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Display" Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Mon May 1 21:24:38 2006 @@ -27,30 +27,28 @@ BEGIN GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 71, 9 + LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Usuñ",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Dodaj",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "&Podgl¹d",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "&Podgl¹d",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "Po wznowieniu wywietl &ekran powitalny.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 141, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Czekaj:",IDC_STATIC,13, 110, 17, 9 + LTEXT "&Czekaj:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "Kliknij przycisk Zasilanie, aby dopasowaæ ustawienia zasilania dla monitora.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -83,6 +81,18 @@ PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Ekran" Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Mon May 1 21:24:38 2006 @@ -43,8 +43,6 @@ #define IDC_SCREENS_USEPASSCHK 1015 #define IDC_SCREENS_TIMEDELAY 1016 #define IDC_SCREENS_TIME 1017 -#define IDC_SCREENS_DELETE 1018 -#define IDC_SCREENS_ADD_BUTTON 1019 #define IDC_SCREENS_DUMMY 5000 #define IDC_SCREENS_DUMMY2 5001 Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=2176… ============================================================================== --- trunk/reactos/dll/cpl/desk/sv.rc (original) +++ trunk/reactos/dll/cpl/desk/sv.rc Mon May 1 21:24:38 2006 @@ -29,30 +29,28 @@ BEGIN GROUPBOX "&Skärmsläckare",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Skärmsläckare:",IDC_STATIC,13, 24, 71, 9 + LTEXT "Skärmsläckare:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Ta bort",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Lägg till",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "&Inställningar",IDC_SCREENS_SETTINGS,138, 124, 48, 12,WS_GROUP - PUSHBUTTON "&Förhandsvisa",IDC_SCREENS_TESTSC,190, 124, 48, 12 + PUSHBUTTON "&Inställningar",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "&Förhandsvisa",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "&Kräv lösenord för att återvända.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Vänta:",IDC_STATIC,13, 110, 17, 9 + LTEXT "&Vänta:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "minuter innan skärmsläckaren visas.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energisparfunktioner för din bildskärm",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Energisparfunktioner för din bildskärm",IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "För att ändra energisparfunktionerna för din bildskärm,\nklicka på Inställningar.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Ins&tällningar",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "Ins&tällningar",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -85,6 +83,18 @@ PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Bildskärm"

1 0

[greatlrd] 21760: Working on a redesign of whole directdraw interface frist commit of many
by greatlrd＠svn.reactos.org 01 May '06

01 May '06

Author: greatlrd Date: Mon May 1 14:04:59 2006 New Revision: 21760 URL: http://svn.reactos.ru/svn/reactos?rev=21760&view=rev Log: Working on a redesign of whole directdraw interface frist commit of many Added: trunk/reactos/dll/directx/ddraw/clipper.c (with props) Removed: trunk/reactos/dll/directx/ddraw/main/clipper_main.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Added: trunk/reactos/dll/directx/ddraw/clipper.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/clipper.c… ============================================================================== --- trunk/reactos/dll/directx/ddraw/clipper.c (added) +++ trunk/reactos/dll/directx/ddraw/clipper.c Mon May 1 14:04:59 2006 @@ -1,0 +1,132 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/clipper.c + * PURPOSE: IDirectDrawClipper Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +ULONG WINAPI +DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) +{ + DX_WINDBG_trace(); + + IDirectDrawClipperImpl* This = (IDirectDrawClipperImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->ref); + + if (ref == 0) + { + /* Add here if we need releae some memory pointer before + * exists + */ + + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; +} + +ULONG WINAPI +DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) +{ + DX_WINDBG_trace(); + + IDirectDrawClipperImpl * This = (IDirectDrawClipperImpl*)iface; + + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->ref); + } + return ref; +} + +HRESULT WINAPI +DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, + LPDIRECTDRAW lpDD, + DWORD dwFlags) +{ + /* FIXME not implment */ + DX_WINDBG_trace(); + DX_STUB_DD_OK; +} + +HRESULT WINAPI +DirectDrawClipper_SetHwnd( LPDIRECTDRAWCLIPPER iface, + DWORD dwFlags, + HWND hWnd) +{ + /* FIXME not implment */ + DX_WINDBG_trace(); + DX_STUB_DD_OK; +} + +HRESULT WINAPI +DirectDrawClipper_GetClipList( LPDIRECTDRAWCLIPPER iface, + LPRECT lpRect, + LPRGNDATA lpClipList, + LPDWORD lpdwSize) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawClipper_SetClipList( LPDIRECTDRAWCLIPPER iface, + LPRGNDATA lprgn, + DWORD dwFlag) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawClipper_QueryInterface( LPDIRECTDRAWCLIPPER iface, + REFIID riid, + LPVOID* ppvObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawClipper_GetHWnd( LPDIRECTDRAWCLIPPER iface, + HWND* hWndPtr) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawClipper_IsClipListChanged( LPDIRECTDRAWCLIPPER iface, + BOOL* lpbChanged) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +IDirectDrawClipperVtbl DirectDrawClipper_Vtable = +{ + DirectDrawClipper_QueryInterface, + DirectDrawClipper_AddRef, + DirectDrawClipper_Release, + DirectDrawClipper_GetClipList, + DirectDrawClipper_GetHWnd, + DirectDrawClipper_Initialize, + DirectDrawClipper_IsClipListChanged, + DirectDrawClipper_SetClipList, + DirectDrawClipper_SetHwnd +}; Propchange: trunk/reactos/dll/directx/ddraw/clipper.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/clipper.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rbu… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Mon May 1 14:04:59 2006 @@ -18,6 +18,8 @@ <file>main.c</file> <file>regsvr.c</file> + <file>clipper.c</file> + <directory name="hal"> <file>ddraw_hal.c</file> <file>surface_hal.c</file> @@ -25,8 +27,7 @@ <directory name="main"> <file>ddraw_main.c</file> - <file>surface_main.c</file> - <file>clipper_main.c</file> + <file>surface_main.c</file> <file>color_main.c</file> <file>gamma_main.c</file> <file>palette_main.c</file> Removed: trunk/reactos/dll/directx/ddraw/main/clipper_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/clip… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/clipper_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/clipper_main.c (removed) @@ -1,78 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/clipper.c - * PURPOSE: IDirectDrawClipper Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -ULONG WINAPI Main_DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) -{ - return 0; -} - -ULONG WINAPI Main_DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) -{ - return 1; -} - -HRESULT WINAPI Main_DirectDrawClipper_Initialize( - LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags) -{ - return DD_OK; -} - -HRESULT WINAPI Main_DirectDrawClipper_SetHwnd( - LPDIRECTDRAWCLIPPER iface, DWORD dwFlags, HWND hWnd) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawClipper_GetClipList( - LPDIRECTDRAWCLIPPER iface, LPRECT lpRect, LPRGNDATA lpClipList, - LPDWORD lpdwSize) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawClipper_SetClipList( - LPDIRECTDRAWCLIPPER iface,LPRGNDATA lprgn,DWORD dwFlag) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawClipper_QueryInterface( - LPDIRECTDRAWCLIPPER iface, REFIID riid, LPVOID* ppvObj) -{ - return E_NOINTERFACE; -} - -HRESULT WINAPI Main_DirectDrawClipper_GetHWnd( - LPDIRECTDRAWCLIPPER iface, HWND* hWndPtr) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawClipper_IsClipListChanged( - LPDIRECTDRAWCLIPPER iface, BOOL* lpbChanged) -{ - DX_STUB; -} - -IDirectDrawClipperVtbl DirectDrawClipper_Vtable = -{ - Main_DirectDrawClipper_QueryInterface, - Main_DirectDrawClipper_AddRef, - Main_DirectDrawClipper_Release, - Main_DirectDrawClipper_GetClipList, - Main_DirectDrawClipper_GetHWnd, - Main_DirectDrawClipper_Initialize, - Main_DirectDrawClipper_IsClipListChanged, - Main_DirectDrawClipper_SetClipList, - Main_DirectDrawClipper_SetHwnd -}; Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Mon May 1 14:04:59 2006 @@ -789,13 +789,18 @@ IDirectDrawImpl *This = (IDirectDrawImpl *)iface; if (pDriverCaps != NULL) - { + { + + + Main_DirectDraw_GetAvailableVidMem(iface, &ddscaps, &This->mDDrawGlobal.ddCaps.dwVidMemTotal, &This->mDDrawGlobal.ddCaps.dwVidMemFree); - + RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + pDriverCaps->dwSize=sizeof(DDCAPS); + status = DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Mon May 1 14:04:59 2006 @@ -159,6 +159,54 @@ } IDirectDrawPaletteImpl; +/******** Gamma Object ********/ + +typedef struct +{ + IDirectDrawGammaControlVtbl* lpVtbl; + LONG ref; + IDirectDrawImpl* Owner; + IDirectDrawSurfaceImpl* Surf; + + +} IDirectDrawGammaImpl; + +/******** Color Object ********/ + +typedef struct +{ + IDirectDrawColorControlVtbl* lpVtbl; + LONG ref; + IDirectDrawImpl* Owner; + IDirectDrawSurfaceImpl* Surf; + + +} IDirectDrawColorImpl; + +/******** Kernel Object ********/ + +typedef struct +{ + IDirectDrawKernelVtbl* lpVtbl; + LONG ref; + IDirectDrawImpl* Owner; + IDirectDrawSurfaceImpl* Surf; + +} IDirectDrawKernelImpl; + +/******** SurfaceKernel Object ********/ + +typedef struct +{ + IDirectDrawSurfaceKernelVtbl* lpVtbl; + LONG ref; + IDirectDrawImpl* Owner; + IDirectDrawSurfaceImpl* Surf; + IDirectDrawKernelImpl * Kernl; + +} IDirectDrawSurfaceKernelImpl; + + /*********** VTables ************/ extern IDirectDraw7Vtbl DirectDraw7_Vtable; @@ -173,6 +221,8 @@ extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable; extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable; extern IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable; +extern IDirectDrawKernelVtbl DirectDrawKernel_Vtable; +extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable; /********* Prototypes **********/ @@ -211,8 +261,16 @@ HRESULT Hel_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); /* HEL CALLBACK */ -DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd); -DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface); +DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver); +DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface); +DWORD CALLBACK HelDdSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKey); +DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode); +DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank); +DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface); +DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette); +DWORD CALLBACK HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine); +DWORD CALLBACK HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode); +DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface); /* Setting for HEL should be move to ros special reg key ? */ @@ -232,6 +290,18 @@ firstcall = FALSE; \ } \ return DDERR_UNSUPPORTED; + +#define DX_STUB_DD_OK \ + static BOOL firstcall = TRUE; \ + if (firstcall) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcall = FALSE; \ + } \ + return DD_OK; + #define DX_STUB_str(x) \ static BOOL firstcall = TRUE; \

1 0

[hpoussin] 21759: Add kbdclass and mouclass as upper filter for keyboard and mouse devices. Install i8042prt driver, even if it is not plug&play compliant at the moment
by hpoussin＠svn.reactos.org 30 Apr '06

30 Apr '06

Author: hpoussin Date: Sun Apr 30 23:17:32 2006 New Revision: 21759 URL: http://svn.reactos.ru/svn/reactos?rev=21759&view=rev Log: Add kbdclass and mouclass as upper filter for keyboard and mouse devices. Install i8042prt driver, even if it is not plug&play compliant at the moment Modified: trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/msmouse.inf Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/keyboard.inf (original) +++ trunk/reactos/media/inf/keyboard.inf Sun Apr 30 23:17:32 2006 @@ -9,7 +9,7 @@ Class = Keyboard ClassGUID = {4D36E96B-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 04/30/2005,1.02 [ClassInstall32.NT] AddReg = KeyboardClass.NT.AddReg @@ -17,8 +17,9 @@ [KeyboardClass.NT.AddReg] HKR, , , 0, %KeyboardClassName% HKR, , Icon, 0, "-2" -;HKR, , Installer32, 0, "syssetup.dll,KeyboardClassInstaller" +HKR, , Installer32, 0, "syssetup.dll,KeyboardClassInstaller" HKR, , NoInstallClass, 0, 1 +HKR, , UpperFilters, 0x00010000, "kbdclass" [Manufacturer] %StdMfg% = StdMfg @@ -36,9 +37,7 @@ i8042prt.sys [PS2_Inst.NT.Services] -;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible -;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst -AddService = , 0x00000002 +AddService = i8042prt, 0x00000002, i8042prt_Service_Inst AddService = kbdclass, , kbdclass_Service_Inst [i8042prt_Service_Inst] @@ -51,7 +50,7 @@ ;---------------------------- KBDCLASS DRIVER --------------------------- [kbdclass_CopyFiles.NT] -mouclass.sys +kbdclass.sys [kbdclass_Service_Inst] ServiceType = 1 Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/msmouse.inf (original) +++ trunk/reactos/media/inf/msmouse.inf Sun Apr 30 23:17:32 2006 @@ -9,7 +9,7 @@ Class = Mouse ClassGUID = {4D36E96F-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 04/30/2005,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -20,8 +20,9 @@ [MouseClass.NT.AddReg] HKR, , , 0, %MouseClassName% HKR, , Icon, 0, "-2" -;HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" +HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" HKR, , NoInstallClass, 0, 1 +HKR, , UpperFilters, 0x00010000, "mouclass" [Manufacturer] %StdMfg% = StdMfg @@ -36,7 +37,7 @@ %*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13 [IbmMfg] -*IBM3780.DeviceDesc = PS2_Inst,*IBM3780 +%*IBM3780.DeviceDesc% = PS2_Inst,*IBM3780 [LogMfg] %*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08 @@ -87,9 +88,7 @@ i8042prt.sys [PS2_Inst.Services] -;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible -;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst -AddService = , 0x00000002 +AddService = i8042prt, 0x00000002, i8042prt_Service_Inst AddService = mouclass, , mouclass_Service_Inst [i8042prt_Service_Inst]

1 0

[ekohl] 21758: Improvement to the r21757 patch.
by ekohl＠svn.reactos.org 30 Apr '06

30 Apr '06

Author: ekohl Date: Sun Apr 30 16:10:31 2006 New Revision: 21758 URL: http://svn.reactos.ru/svn/reactos?rev=21758&view=rev Log: Improvement to the r21757 patch. Modified: trunk/reactos/drivers/filesystems/np/rw.c Modified: trunk/reactos/drivers/filesystems/np/rw.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/rw.c… ============================================================================== --- trunk/reactos/drivers/filesystems/np/rw.c (original) +++ trunk/reactos/drivers/filesystems/np/rw.c Sun Apr 30 16:10:31 2006 @@ -318,10 +318,15 @@ Fcb = FileObject->FsContext; Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - if (Fcb->OtherSide == NULL && Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + if (Fcb->OtherSide == NULL) { - DPRINT("Pipe is NOT yet connected!\n"); - Status = STATUS_PIPE_LISTENING; + DPRINT("Pipe is NOT connected!\n"); + if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + Status = STATUS_PIPE_LISTENING; + else if (Fcb->PipeState == FILE_PIPE_DISCONNECTED_STATE) + Status = STATUS_PIPE_DISCONNECTED; + else + Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; goto done; }

1 0

[ekohl] 21757: An attempt to read from a not-yet-connected pipe must fail. This fixes a Wine testcase.
by ekohl＠svn.reactos.org 30 Apr '06

30 Apr '06

Author: ekohl Date: Sun Apr 30 11:47:07 2006 New Revision: 21757 URL: http://svn.reactos.ru/svn/reactos?rev=21757&view=rev Log: An attempt to read from a not-yet-connected pipe must fail. This fixes a Wine testcase. Modified: trunk/reactos/drivers/filesystems/np/rw.c Modified: trunk/reactos/drivers/filesystems/np/rw.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/rw.c… ============================================================================== --- trunk/reactos/drivers/filesystems/np/rw.c (original) +++ trunk/reactos/drivers/filesystems/np/rw.c Sun Apr 30 11:47:07 2006 @@ -318,6 +318,14 @@ Fcb = FileObject->FsContext; Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; + if (Fcb->OtherSide == NULL && Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + { + DPRINT("Pipe is NOT yet connected!\n"); + Status = STATUS_PIPE_LISTENING; + Irp->IoStatus.Information = 0; + goto done; + } + if (Fcb->Data == NULL) { DPRINT1("Pipe is NOT readable!\n"); @@ -529,7 +537,7 @@ } Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; - + ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); if (IoIsOperationSynchronous(Irp))

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