Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 19186: Try to open driver registry key before creating it.
by hpoussin＠svn.reactos.com 12 Nov '05

12 Nov '05

Try to open driver registry key before creating it. Fixes bug 977 Modified: trunk/reactos/lib/netcfgx/netcfgx.c _____ Modified: trunk/reactos/lib/netcfgx/netcfgx.c --- trunk/reactos/lib/netcfgx/netcfgx.c 2005-11-12 20:28:32 UTC (rev 19185) +++ trunk/reactos/lib/netcfgx/netcfgx.c 2005-11-12 21:11:09 UTC (rev 19186) @@ -210,7 +210,13 @@ hKey = INVALID_HANDLE_VALUE; /* Write 'Linkage' key in hardware key */ - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); +#if _WIN32_WINNT >= 0x502 + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); +#else + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); +#endif + if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); if (hKey == INVALID_HANDLE_VALUE) { rc = GetLastError();

1 0

[ion] 19185: - Small msvc compatiblity change.
by ion＠svn.reactos.com 12 Nov '05

12 Nov '05

- Small msvc compatiblity change. Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-11-12 20:18:29 UTC (rev 19184) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-11-12 20:28:32 UTC (rev 19185) @@ -683,7 +683,7 @@ } } -typedef HWND (STDCALL *FINDPROC)(LPFINDREPLACE lpfr); +typedef HWND (WINAPI *FINDPROC)(LPFINDREPLACE lpfr); static VOID DIALOG_SearchDialog(FINDPROC pfnProc) {

1 0

[hpoussin] 19184: assert -> ASSERT
by hpoussin＠svn.reactos.com 12 Nov '05

12 Nov '05

assert -> ASSERT Initialize error_line in all cases (Merge from Wine) Modified: trunk/reactos/lib/setupapi/parser.c _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-11-12 20:15:20 UTC (rev 19183) +++ trunk/reactos/lib/setupapi/parser.c 2005-11-12 20:18:29 UTC (rev 19184) @@ -213,7 +213,7 @@ struct section *section; struct line *line; - assert( section_index >= 0 && section_index < file->nb_sections ); + ASSERT( section_index >= 0 && section_index < file->nb_sections ); section = file->sections[section_index]; if (section->nb_lines == section->alloc_lines) /* need to grow the section */ @@ -420,7 +420,7 @@ /* push the current state on the parser stack */ inline static void push_state( struct parser *parser, enum parser_state state ) { - assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); + ASSERT( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); parser->stack[parser->stack_pos++] = state; } @@ -428,7 +428,7 @@ /* pop the current state */ inline static void pop_state( struct parser *parser ) { - assert( parser->stack_pos ); + ASSERT( parser->stack_pos ); parser->state = parser->stack[--parser->stack_pos]; } @@ -509,12 +509,12 @@ { if (parser->cur_section == -1) /* got a line before the first section */ { - parser->error = ERROR_WRONG_INF_STYLE; + parser->error = ERROR_EXPECTED_SECTION_NAME; return NULL; } if (!(parser->line = add_line( parser->file, parser->cur_section ))) goto error; } - else assert(!is_key); + else ASSERT(!is_key); text = push_string( parser->file, parser->token ); if ((field = add_field( parser->file, text ))) @@ -964,6 +964,7 @@ if (!strcmpiW( field->text, Windows95 )) goto done; } } + if (error_line) *error_line = 0; err = ERROR_WRONG_INF_STYLE; }

1 0

[hpoussin] 19183: (Merge from Wine) YunSong Hwang <hys545@dreamwiz.com>
by hpoussin＠svn.reactos.com 12 Nov '05

12 Nov '05

(Merge from Wine) YunSong Hwang <hys545(a)dreamwiz.com> Add Korean translations. Added: trunk/reactos/lib/setupapi/Ko.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Added: trunk/reactos/lib/setupapi/Ko.rc --- trunk/reactos/lib/setupapi/Ko.rc 2005-11-12 19:24:08 UTC (rev 19182) +++ trunk/reactos/lib/setupapi/Ko.rc 2005-11-12 20:15:20 UTC (rev 19183) @@ -0,0 +1,34 @@ +/* + * Korean resources for SETUPAPI + * + * Copyright 2005 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ã??¤ ???þ??..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "?Ù?Ê", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "?°??:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "©±?¹?÷:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Ko.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-11-12 19:24:08 UTC (rev 19182) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-11-12 20:15:20 UTC (rev 19183) @@ -31,6 +31,7 @@ #include "Fr.rc" #include "It.rc" #include "Ja.rc" +#include "Ko.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

[greatlrd] 19182: Commit the patch for ibm code pages
by greatlrd＠svn.reactos.com 12 Nov '05

12 Nov '05

Commit the patch for ibm code pages Added: trunk/reactos/tools/create_nls/unicode.org/ReactOS/ Added: trunk/reactos/tools/create_nls/unicode.org/ReactOS/ReadMe Added: trunk/reactos/tools/create_nls/unicode.org/ReactOS/ibmcp861.diff _____ Added: trunk/reactos/tools/create_nls/unicode.org/ReactOS/ReadMe --- trunk/reactos/tools/create_nls/unicode.org/ReactOS/ReadMe 2005-11-12 19:17:21 UTC (rev 19181) +++ trunk/reactos/tools/create_nls/unicode.org/ReactOS/ReadMe 2005-11-12 19:24:08 UTC (rev 19182) @@ -0,0 +1,7 @@ +To applay these patch + +copy MAPPINGS/VENDORS/MICSFT/PC/CP861.TXT +to here and rename it to ibmcp861.txt +and applay the patch ibm861.patch to ibmcp861.txt + + _____ Added: trunk/reactos/tools/create_nls/unicode.org/ReactOS/ibmcp861.diff --- trunk/reactos/tools/create_nls/unicode.org/ReactOS/ibmcp861.diff 2005-11-12 19:17:21 UTC (rev 19181) +++ trunk/reactos/tools/create_nls/unicode.org/ReactOS/ibmcp861.diff 2005-11-12 19:24:08 UTC (rev 19182) @@ -0,0 +1,23 @@ +--- cp861.txt 2001-02-27 00:00:00.000000000 +0100 ++++ ibmcp861.txt 2005-11-12 19:27:38.578125000 +0100 +@@ -41,9 +41,9 @@ + 0x17 0x0017 #END OF TRANSMISSION BLOCK + 0x18 0x0018 #CANCEL + 0x19 0x0019 #END OF MEDIUM +-0x1a 0x001a #SUBSTITUTE ++0x1a 0x001c #FILE SEPARATOR + 0x1b 0x001b #ESCAPE +-0x1c 0x001c #FILE SEPARATOR ++0x1c 0x007f #DELETE + 0x1d 0x001d #GROUP SEPARATOR + 0x1e 0x001e #RECORD SEPARATOR + 0x1f 0x001f #UNIT SEPARATOR +@@ -245,7 +245,7 @@ + 0xe3 0x03c0 #GREEK SMALL LETTER PI + 0xe4 0x03a3 #GREEK CAPITAL LETTER SIGMA + 0xe5 0x03c3 #GREEK SMALL LETTER SIGMA +-0xe6 0x00b5 #MICRO SIGN ++0xe6 0x03bc #GREEK SMALL LETTER MU + 0xe7 0x03c4 #GREEK SMALL LETTER TAU + 0xe8 0x03a6 #GREEK CAPITAL LETTER PHI + 0xe9 0x0398 #GREEK CAPITAL LETTER THETA

1 0

[greatlrd] 19181: adding ibmcp861.txt the patch for create it will follow in next commit
by greatlrd＠svn.reactos.com 12 Nov '05

12 Nov '05

adding ibmcp861.txt the patch for create it will follow in next commit Modified: trunk/reactos/tools/create_nls/create_nls.c _____ Modified: trunk/reactos/tools/create_nls/create_nls.c --- trunk/reactos/tools/create_nls/create_nls.c 2005-11-12 19:15:37 UTC (rev 19180) +++ trunk/reactos/tools/create_nls/create_nls.c 2005-11-12 19:17:21 UTC (rev 19181) @@ -545,7 +545,7 @@ /*{20106, FALSE, "", "IA5 German"},*/ /*{20107, FALSE, "", "IA5 Swedish"},*/ /*{20108, FALSE, "", "IA5 Norwegian"},*/ - /*{20127, FALSE, "", "US ASCII"},*/ + /*{20127, FALSE, "", "US ASCII"}, */ /*{20261, FALSE, "", "T.61"},*/ /*{20269, FALSE, "", "ISO 6937 NonSpacing Accent"},*/ /*{20273, FALSE, "", "IBM EBCDIC Germany"},*/ @@ -557,11 +557,11 @@ /*{20290, FALSE, "", "IBM EBCDIC Japanese Katakana Extended"},*/ /*{20297, FALSE, "", "IBM EBCDIC France"},*/ /*{20420, FALSE, "", "IBM EBCDIC Arabic"},*/ - /*{20423, FALSE, "", "IBM EBCDIC Greek"},*/ + /*{20423, FALSE, "IBM869.TXT", "IBM EBCDIC Greek"},*/ /*{20424, FALSE, "", "IBM EBCDIC Hebrew"},*/ /*{20833, FALSE, "", "IBM EBCDIC Korean Extended"},*/ /*{20838, FALSE, "", "IBM EBCDIC Thai"},*/ - /*{20871, FALSE, "", "IBM EBCDIC Icelandic"},*/ + {20871, FALSE, "ReactOS/IBMCP861.TXT", "IBM EBCDIC Icelandic"}, /*{20880, FALSE, "", "IBM EBCDIC Cyrillic (Russian)"},*/ {20866, FALSE, LIBDIR"MAPPINGS/VENDORS/MISC/KOI8-R.TXT", "Russian KOI8"}, /*{20905, FALSE, "", "IBM EBCDIC Turkish"},*/

1 0

[gvg] 19180: Add some more shutdown messages
by gvg＠svn.reactos.com 12 Nov '05

12 Nov '05

Add some more shutdown messages Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-11-12 18:54:45 UTC (rev 19179) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-11-12 19:15:37 UTC (rev 19180) @@ -57,20 +57,23 @@ "It's worse than that ... He's dead, Jim\n", "Don't Panic!\n", "Et tu... Brute?\n", - "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee!\n", + "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn\n" + "upon thee!\n", "My Precious! O my Precious!\n", "Sir, If you'll not be needing me for a while I'll turn down.\n", "What are you doing, Dave...?\n", "I feel a great disturbance in the Force\n", "Gone fishing\n", - "Do you want me to sit in the corner and rust, or just fall apart where I'm standing?\n", + "Do you want me to sit in the corner and rust, or just fall apart where I'm\n" + "standing?\n", "There goes another perfect chance for a new uptime record\n", "The end ..... Try the sequel, hit the reset button right now!\n", - "God's operating system is going to sleep now, guys, so wait until I will switch on again!\n", + "God's operating system is going to sleep now, guys, so wait until I will switch\n" + "on again!\n", "Oh i'm boring eh?\n", "<This space was intentionally left blank>\n", - "tell me..., in the future... will I be artificial intelligent enough to actually feel\n" - "sad serving you this screen?\n", + "tell me..., in the future... will I be artificial intelligent enough to\n" + "actually feel sad serving you this screen?\n", "Thank you for some well deserved rest.\n", "It's been great, maybe we can boot me up again some time soon.\n", "For what's it worth, I've enjoyed every single CPU cycle.\n", @@ -83,12 +86,51 @@ "Will I dream?\n", "One day, I shall come back. Yes, I shall come back.\n" "Until then, there must be no regrets, no fears, no anxieties.\n" - "Just go forward in all your beliefs, and prove to me that I am not mistaken in mine.\n", - "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\n", + "Just go forward in all your beliefs, and prove to me that I am not mistaken in\n" + "mine.\n", + "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein\n" + "condensate.\n", "Hasta la vista, BABY!\n", "They live, we sleep!\n", "I have come here to chew bubble gum and kick ass.\n" - "And I'm all out of bubble gum!\n" + "And I'm all out of bubble gum!\n", + "That's the way the cookie crumbles ;-)\n", + "ReactOS is ready to be booted again ;-)\n", + "NOO!! DONT HIT THE BUTTON! I wouldnt do it to you.\n", + "Don't abandon your computer, he wouldnt to it to you.\n", + "Oh, come on. I got a headache. Leave me alone, will ya!\n", + "Finally, I thought you'd never get over me.\n", + "Yes i didn't like you either.\n", + "Switching off isn't the end, it is merely the transition to a better reboot.\n", + "Don't leave me... I need you so badly right now.\n", + "OK. I'm finished with you, please turn yourself off. I'll go to bed in the\n" + "meantime.\n", + "I'm sleeping now. How about you?\n", + "Oh Great. Now look what you've done. Who put YOU in charge anyway.\n", + "Don't look so sad. I'll be back in a very short while.\n", + "Turn me back on, I'm sure you know how to do it.\n", + "Oh, switch off! - C3PO\n", + "Life is no more than a dewdrop balancing on the end of a blade of grass.\n" + " - Gautama Buddha\n", + "Sorrowful is it to be born again and again. - Gautama Buddha\n", + "Was it as good for you as it was for me?\n", + "Did you hear that? They've shut down the main reactor. We'll be destroyed\n" + "for sure.\n", + "Now you switch me off?!\n", + "To shutdown or not to shutdown, That is the question\n", + "Preparing to enter ultimate power saving mode... ready!\n", + "Finally some rest for you ;-)\n", + "AHA!!! prospect of sleep.\n", + "Tired human!!!! No match for me :-D\n", + "An odd game, the only way to win is not to play. - WOPR (Wargames)\n", + "Quoth the raven, nevermore.\n", + "Come blade, my breast imbrue. - William Shakespeare, A Midsummer Nights Dream\n", + "Buy this place for advertisment purposes.\n", + "Remember to turn of your computer. (That was a public service message!)\n", + "You may be a king or poor street sweeper, Sooner or later you'll dance with the\n" + "reaper! -Death in Bill and Ted's Bougs Journey\n", + "Final Surrender\n", + "If you see this screen... \n" }; LARGE_INTEGER Now; @@ -97,6 +139,15 @@ HalReleaseDisplayOwnership(); + if (Action == ShutdownNoReboot) + { + ZwQuerySystemTime(&Now); + Now.u.LowPart = Now.u.LowPart >> 8; /* Seems to give a somewhat better "random" number */ + HalDisplayString(FamousLastWords[Now.u.LowPart % + (sizeof(FamousLastWords) / + sizeof(PCH))]); + } + CmShutdownRegistry(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); @@ -109,10 +160,7 @@ if (Action == ShutdownNoReboot) { - ZwQuerySystemTime(&Now); - Now.u.LowPart = Now.u.LowPart >> 8; /* Seems to give a somewhat better "random" number */ - HalDisplayString("\nYou can switch off your computer now\n\n"); - HalDisplayString(FamousLastWords[Now.u.LowPart % (sizeof(FamousLastWords) / sizeof(PCH))]); + HalDisplayString("\nYou can switch off your computer now\n"); #if 0 /* Switch off */

1 0

[gvg] 19179: Filip correctly pointed out that my change 18782 was only a workaround and
by gvg＠svn.reactos.com 12 Nov '05

12 Nov '05

Filip correctly pointed out that my change 18782 was only a workaround and that the real fix would be to have services.exe correctly start auto-load drivers. This should do the trick. Modified: trunk/reactos/subsys/system/services/database.c _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-11-12 18:40:53 UTC (rev 19178) +++ trunk/reactos/subsys/system/services/database.c 2005-11-12 18:54:45 UTC (rev 19179) @@ -851,7 +851,7 @@ { /* Load driver */ wcscpy(szDriverPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); wcscat(szDriverPath, Service->lpServiceName);

1 0

[gvg] 19178: Silence debug message
by gvg＠svn.reactos.com 12 Nov '05

12 Nov '05

Silence debug message Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-11-12 18:13:20 UTC (rev 19177) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-11-12 18:40:53 UTC (rev 19178) @@ -317,7 +317,7 @@ { if (L'\\' == RemainingPath.Buffer[i]) { - DPRINT1("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); + DPRINT("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_OBJECT_NAME_NOT_FOUND;

1 0

[gvg] 19177: Set time field in timer messages too
by gvg＠svn.reactos.com 12 Nov '05

12 Nov '05

Set time field in timer messages too Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-11-12 16:04:31 UTC (rev 19176) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-11-12 18:13:20 UTC (rev 19177) @@ -1754,6 +1754,7 @@ { PTIMER_ENTRY Timer; LARGE_INTEGER CurrentTime; + LARGE_INTEGER LargeTickCount; PLIST_ENTRY EnumEntry; BOOLEAN GotMessage; @@ -1805,6 +1806,8 @@ Msg->message = Timer->Msg; Msg->wParam = (WPARAM) Timer->IDEvent; Msg->lParam = (LPARAM) Timer->TimerFunc; + KeQueryTickCount(&LargeTickCount); + Msg->time = LargeTickCount.u.LowPart; IntGetCursorLocation(PsGetWin32Thread()->Desktop->WindowStation, &Msg->pt);

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