Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[mf] 18258: complete german resources for explorer
by mf＠svn.reactos.com 04 Oct '05

04 Oct '05

complete german resources for explorer Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc --- trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 02:46:14 UTC (rev 18257) +++ trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 12:02:34 UTC (rev 18258) @@ -205,7 +205,40 @@ END END +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Einstellungen...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Task Manager...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&?ber Explorer...", ID_ABOUT_EXPLORER + END +END +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Zeige versteckte Icons", ID_SHOW_HIDDEN_ICONS + MENUITEM "Zeige Icon-&Button", ID_SHOW_ICON_BUTTON + MENUITEM "&Konfiguriere Benachrichtigungen...", ID_CONFIG_NOTIFYAREA + MENUITEM "Einstellen von &Datum/Zeit...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&?ber Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Íffne &Lautstõrkeregler", ID_TRAY_VOLUME + MENUITEM "Editieren der Audio-&Einstellungen", ID_VOLUME_PROPERTIES + END +END + + //////////////////////////////////////////////////////////////////////// ///// // // Dialog @@ -229,7 +262,7 @@ IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Explorer" +CAPTION "?ber ReactOS Explorer" FONT 10, "MS Sans Serif" BEGIN LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 @@ -242,7 +275,132 @@ 154,90,38,12 END +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 204 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Desktop-Einstellungen" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Bitte wõhlen Sie den gew³nschten Platzierungs-Algorithmus f³r die Desktop-Icons aus:", + IDC_STATIC,7,7,197,23 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,35,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,35,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,35,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,35,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,83,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,83,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,83,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,83,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,131,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,131,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,131,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,131,46,44 + CONTROL "Anzeige der &Versionsnummer",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,187,107,10 +END +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 204 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Startmenu-Einstellungen" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 204 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Taskbar-Einstellungen" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Anzeigen der &Uhr",ID_SHOW_CLOCK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,152,71,10 + CONTROL "&verstecke inaktive Notification-Icons", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,131,10 + PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Auswahl des Explorerfenster-Modus" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Please select your prefered explorer user interface:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Íffne Unterverzeichnisses in &neuen Fenstern", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,157,10 + LTEXT "Diese Auswahl wird k³nftig f³r alle Explorer-Fenster verwendet werden.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "A&bbrechen",IDCANCEL,106,136,50,14 +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Konfiguration der Benachrichtigungs-Icons" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Tooltip-Text:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "&Fenster-Titel:",IDC_LABEL2,7,63,42,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Modulpfad:",IDC_LABEL3,7,81,36,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Anzeigemodus",IDC_LABEL4,7,96,157,28 + CONTROL "&zeigen",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,37,10 + CONTROL "&verstecken",IDC_NOTIFY_HIDE,"Button", + BS_AUTORADIOBUTTON,55,108,51,10 + CONTROL "a&utomatisch",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,110,108,54,10 + ICON "",IDC_PICTURE,173,101,20,20 + LTEXT "&Letzte ?nderung:",IDC_LABEL6,7,132,55,8 + EDITTEXT IDC_LAST_CHANGE,66,129,98,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "zei&ge versteckte",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,68,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "A&bbrechen",IDCANCEL,151,153,50,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Programmsuche im Startmenu" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,96,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "Alle ³ber&pr³fen",IDC_CHECK_ENTRIES,138,7,55,14 +END + + #ifdef APSTUDIO_INVOKED //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-04 02:46:14 UTC (rev 18257) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-04 12:02:34 UTC (rev 18258) @@ -363,15 +363,15 @@ IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Choose MDI / SDI mode" +CAPTION "Choose Explorer window mode" FONT 8, "MS Sans Serif" BEGIN LTEXT "Please select your prefered explorer user interface:", IDC_STATIC,7,7,160,8 - CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 - CONTROL "&SDI (single document interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,62,115,10 + CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 CONTROL "Open Subfolders in s&eparate windows", @@ -383,7 +383,22 @@ PUSHBUTTON "&Cancel",IDCANCEL,106,136,50,14 END +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + #ifdef APSTUDIO_INVOKED //////////////////////////////////////////////////////////////////////// ///// //

1 0

[npwoods] 18257: Regedit: Fixed stupid compilation errors
by npwoods＠svn.reactos.com 04 Oct '05

04 Oct '05

Regedit: Fixed stupid compilation errors Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regproc.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-04 02:40:01 UTC (rev 18256) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-04 02:46:14 UTC (rev 18257) @@ -365,7 +365,7 @@ ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { BOOL result; - LPCSTR pszExportKeyPath; + LPSTR pszExportKeyPath; #ifdef UNICODE CHAR buffer[_MAX_PATH]; _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-04 02:40:01 UTC (rev 18256) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-04 02:46:14 UTC (rev 18257) @@ -1290,7 +1290,7 @@ FILE *file = _tfopen(file_name, _T("w")); if (!file) { perror(""); - fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name); +/* fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name);*/ exit(1); } fputs("REGEDIT4\n", file);

1 0

[npwoods] 18256: Regedit: Fixed exporting subtrees with Unicode
by npwoods＠svn.reactos.com 04 Oct '05

04 Oct '05

Regedit: Fixed exporting subtrees with Unicode Core exporting code still ANSI; need to fix this Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/regproc.h _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-03 23:01:10 UTC (rev 18255) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-04 02:40:01 UTC (rev 18256) @@ -365,10 +365,17 @@ ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { BOOL result; - /* FIXME - convert strings to ascii! */ - result = export_registry_key((CHAR*)ofn.lpstrFile, (CHAR*)ExportKeyPath); - /*result = export_registry_key(ofn.lpstrFile, NULL);*/ - /*if (!export_registry_key(ofn.lpstrFile, NULL)) {*/ + LPCSTR pszExportKeyPath; +#ifdef UNICODE + CHAR buffer[_MAX_PATH]; + + WideCharToMultiByte(CP_ACP, 0, ExportKeyPath, -1, buffer, sizeof(buffer), NULL, NULL); + pszExportKeyPath = buffer; +#else + pszExportKeyPath = ExportKeyPath; +#endif + + result = export_registry_key(ofn.lpstrFile, pszExportKeyPath); if (!result) { /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ return FALSE; _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-03 23:01:10 UTC (rev 18255) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-04 02:40:01 UTC (rev 18256) @@ -1285,9 +1285,9 @@ /*********************************************************************** ******* * Open file for export. */ -static FILE *REGPROC_open_export_file(CHAR *file_name) +static FILE *REGPROC_open_export_file(const TCHAR *file_name) { - FILE *file = fopen(file_name, "w"); + FILE *file = _tfopen(file_name, _T("w")); if (!file) { perror(""); fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name); @@ -1305,7 +1305,7 @@ * reg_key_name - registry branch to export. The whole registry is exported if * reg_key_name is NULL or contains an empty string. */ -BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name) +BOOL export_registry_key(const TCHAR *file_name, CHAR *reg_key_name) { HKEY reg_key_class; _____ Modified: trunk/reactos/subsys/system/regedit/regproc.h --- trunk/reactos/subsys/system/regedit/regproc.h 2005-10-03 23:01:10 UTC (rev 18255) +++ trunk/reactos/subsys/system/regedit/regproc.h 2005-10-04 02:40:01 UTC (rev 18256) @@ -38,7 +38,7 @@ void doRegisterDLL(LPSTR lpsLine); void doUnregisterDLL(LPSTR lpsLine); -BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name); +BOOL export_registry_key(const TCHAR *file_name, CHAR *reg_key_name); BOOL import_registry_file(LPTSTR filename); void delete_registry_key(CHAR *reg_key_name);

1 0

[weiden] 18255: don't leak memory in RegDeleteTree() when NtEnumerateKey() returns an unexpected error code (such as when there's insufficient system resources to perform the query)
by weiden＠svn.reactos.com 03 Oct '05

03 Oct '05

don't leak memory in RegDeleteTree() when NtEnumerateKey() returns an unexpected error code (such as when there's insufficient system resources to perform the query) Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 22:46:49 UTC (rev 18254) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 23:01:10 UTC (rev 18255) @@ -1479,14 +1479,18 @@ } SubKeyFailure: - ASSERT(newDelKeys != NULL); - RtlFreeHeap(ProcessHeap, - 0, - newDelKeys); + /* newDelKeys can be NULL here when NtEnumerateKey returned an + error other than STATUS_BUFFER_TOO_SMALL or STATUS_BUFFER_OVERFLOW! */ + if (newDelKeys != NULL) + { + RtlFreeHeap(ProcessHeap, + 0, + newDelKeys); + } SubKeyFailureNoFree: /* don't break, let's try to delete as many keys as possible */ - if (Status2 != STATUS_NO_MORE_ENTRIES && NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { Status = Status2; }

1 0

[weiden] 18254: fixed a memory leak in RegDeleteTree() that could be caused when two threads attempt to delete the same tree simultaneously
by weiden＠svn.reactos.com 03 Oct '05

03 Oct '05

fixed a memory leak in RegDeleteTree() that could be caused when two threads attempt to delete the same tree simultaneously Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 21:40:58 UTC (rev 18253) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 22:46:49 UTC (rev 18254) @@ -1466,7 +1466,15 @@ } else if (Status2 == STATUS_NO_MORE_ENTRIES) { - ASSERT(newDelKeys == NULL); + /* in some race conditions where another thread would delete + the same tree at the same time, newDelKeys could actually + be != NULL! */ + if (newDelKeys != NULL) + { + RtlFreeHeap(ProcessHeap, + 0, + newDelKeys); + } break; } @@ -1555,7 +1563,7 @@ NULL); Status = NtOpenKey(&SubKeyHandle, - DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + DELETE | KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); if (!NT_SUCCESS(Status)) {

1 0

[ea] 18253: A note about this piece of code.
by ea＠svn.reactos.com 03 Oct '05

03 Oct '05

A note about this piece of code. Added: trunk/reactos/lib/nt/readme.txt _____ Added: trunk/reactos/lib/nt/readme.txt --- trunk/reactos/lib/nt/readme.txt 2005-10-03 21:37:05 UTC (rev 18252) +++ trunk/reactos/lib/nt/readme.txt 2005-10-03 21:40:58 UTC (rev 18253) @@ -0,0 +1,2 @@ +This is the startup code for NT native processes. +(smss.exe, autochk.exe, csrss.exe) Property changes on: trunk/reactos/lib/nt/readme.txt ___________________________________________________________________ Name: svn:eol-style + native

1 0

[weiden] 18252: Don't fail when there are no more subkeys to delete in RegDeleteTree()
by weiden＠svn.reactos.com 03 Oct '05

03 Oct '05

Don't fail when there are no more subkeys to delete in RegDeleteTree() Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 21:35:12 UTC (rev 18251) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 21:37:05 UTC (rev 18252) @@ -1404,7 +1404,7 @@ /* open the subkey */ Status2 = NtOpenKey(&newDelKeys->KeyHandle, - DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + DELETE | KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); if (!NT_SUCCESS(Status2)) { @@ -1464,6 +1464,11 @@ Status2 = STATUS_INSUFFICIENT_RESOURCES; } } + else if (Status2 == STATUS_NO_MORE_ENTRIES) + { + ASSERT(newDelKeys == NULL); + break; + } SubKeyFailure: ASSERT(newDelKeys != NULL); @@ -1511,7 +1516,7 @@ } else Status = STATUS_INSUFFICIENT_RESOURCES; - + return Status; }

1 0

[ea] 18251: A raw attempt to fix the startup code for native processes.
by ea＠svn.reactos.com 03 Oct '05

03 Oct '05

A raw attempt to fix the startup code for native processes. (note: it seems NTOSKRNL passes nothing to smss.exe) Modified: trunk/reactos/lib/nt/entry_point.c _____ Modified: trunk/reactos/lib/nt/entry_point.c --- trunk/reactos/lib/nt/entry_point.c 2005-10-03 20:28:29 UTC (rev 18250) +++ trunk/reactos/lib/nt/entry_point.c 2005-10-03 21:35:12 UTC (rev 18251) @@ -23,11 +23,36 @@ ULONG DebugFlag ); -#define NDEBUG +//#define NDEBUG #include <debug.h> -/* FUNCTIONSS ****************************************************************/ +/* FUNCTIONS ****************************************************************/ +ULONG FASTCALL WideCharStringToUnicodeString (PWCHAR wsIn, PUNICODE_STRING usOut) +{ + ULONG Length = 0; + PWCHAR CurrentChar = wsIn; + + DPRINT("%s(%08lx,%08lx) called\n", __FUNCTION__, wsIn, usOut); + + if (NULL != CurrentChar) + { + usOut->Buffer = CurrentChar; + while (*CurrentChar ++) + { + ++ Length; + while (*CurrentChar ++) + { + ++ Length; + } + } + ++ Length; + } + usOut->Length = Length; + usOut->MaximumLength = Length; + return Length; +} + VOID STDCALL NtProcessStartup(PPEB Peb) @@ -36,6 +61,8 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParameters; PUNICODE_STRING CmdLineString; ANSI_STRING AnsiCmdLine; + UNICODE_STRING UnicodeEnvironment; + ANSI_STRING AnsiEnvironment; PCHAR NullPointer = NULL; INT argc = 0; PCHAR *argv; @@ -45,6 +72,8 @@ ULONG Length; ASSERT(Peb); + DPRINT("%s(%08lx) called\n", __FUNCTION__, Peb); + /* Normalize and get the Process Parameters */ ProcessParameters = RtlNormalizeProcessParams(Peb->ProcessParameters); ASSERT(ProcessParameters); @@ -93,6 +122,7 @@ { /* Save one token pointer */ *ArgumentList++ = Destination; + DPRINT("NT: argv[%d]=[%d]\n", argc, Destination); /* Increase one token count */ argc++; @@ -112,25 +142,30 @@ /* Now handle the enviornment, point the envp at our current list location. */ envp = ArgumentList; - /* Change our source to the enviroment pointer */ - Source = (PCHAR)ProcessParameters->Environment; - - /* Simply do a direct copy */ - if (Source) + if (0 < WideCharStringToUnicodeString (ProcessParameters->Environment, & UnicodeEnvironment)) { - while (*Source) - { - /* Save a pointer to this token */ - *ArgumentList++ = Source; + RtlUnicodeStringToAnsiString (& AnsiEnvironment, & UnicodeEnvironment, TRUE); - /* Keep looking for another variable */ - while (*Source++); - } - } + /* Change our source to the enviroment pointer */ + Source = AnsiEnvironment.Buffer; - /* Null terminate the list again */ - *ArgumentList++ = NULL; + /* Simply do a direct copy */ + if (Source) + { + while (*Source) + { + /* Save a pointer to this token */ + *ArgumentList++ = Source; + DPRINT("NT: envp[%08x]=[%s]\n",Source,Source); + /* Keep looking for another variable */ + while (*Source++); + } + } + + /* Null terminate the list again */ + *ArgumentList++ = NULL; + } /* Breakpoint if we were requested to do so */ if (ProcessParameters->DebugFlags) DbgBreakPoint();

1 0

[turner] 18250: dont use the whole commandline as a fall back for execution searching because it could contain spaces. also, wrap commandline params in quotes so if there is a space in the path it still finds it. bug found by billgMS.
by turner＠svn.reactos.com 03 Oct '05

03 Oct '05

dont use the whole commandline as a fall back for execution searching because it could contain spaces. also, wrap commandline params in quotes so if there is a space in the path it still finds it. bug found by billgMS. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-10-03 18:49:44 UTC (rev 18249) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-10-03 20:28:29 UTC (rev 18250) @@ -423,15 +423,12 @@ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (first, szFullName)) { - if (!SearchForExecutable (full, szFullName)) - { error_bad_command (); free (first); free (rest); free (full); free (szFullName); return; - } } @@ -1619,13 +1616,14 @@ ++i; if (i < argc) { - _tcscpy (commandline, argv[i]); + _tcscpy (commandline, _T("\"")); + _tcscat (commandline, argv[i]); + _tcscat (commandline, _T("\"")); while (++i < argc) { _tcscat (commandline, _T(" ")); _tcscat (commandline, argv[i]); } - ParseCommandLine(commandline); } }

1 0

[hbirr] 18249: Return an error instead of STATUS_SUCCESS for functions which are not implemented or supported (in ScsiPortDeviceControl).
by hbirr＠svn.reactos.com 03 Oct '05

03 Oct '05

Return an error instead of STATUS_SUCCESS for functions which are not implemented or supported (in ScsiPortDeviceControl). Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-03 18:32:30 UTC (rev 18248) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-03 18:49:44 UTC (rev 18249) @@ -32,6 +32,7 @@ #include <ddk/srb.h> #include <ddk/scsi.h> #include <ddk/ntddscsi.h> +#include <ddk/ntddstor.h> #include <stdio.h> #define NDEBUG @@ -1710,10 +1711,10 @@ { PIO_STACK_LOCATION Stack; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("ScsiPortDeviceControl()\n"); - Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -1755,16 +1756,35 @@ DPRINT("Inquiry data size: %lu\n", Irp->IoStatus.Information); } break; + + case IOCTL_SCSI_PASS_THROUGH: + DPRINT(" IOCTL_SCSI_PASS_THROUGH\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + case IOCTL_SCSI_PASS_THROUGH_DIRECT: + DPRINT(" IOCTL_SCSI_PASS_THROUGH_DIRECT\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case IOCTL_SCSI_MINIPORT: + DPRINT1(" IOCTL_SCSI_MINIPORT\n"); + DPRINT1(" Signature: %.8s\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->Signature); + DPRINT1(" ControlCode: 0x%lX\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->ControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + default: DPRINT1(" unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; break; } + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(STATUS_SUCCESS); + return Status; } static VOID

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005