Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[mf] 15460: - fixed for FOR _NO_EXTENSIONS mode

by mf＠svn.reactos.com

- fixed for FOR _NO_EXTENSIONS mode - implement ID_VIEW_SPLIT command Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@ MENUITEM "Bara tr&õd", 411 MENUITEM "Bara &mapp", 412 MENUITEM SEPARATOR - MENUITEM "De&la", 414 + MENUITEM "De&la", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Namn", ID_VIEW_NAME MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -86,7 +86,7 @@ MENUITEM "&Jen strom" , 411 MENUITEM "Jen &adresß°e" , 412 MENUITEM SEPARATOR - MENUITEM "&Rozdýlit" , 414 + MENUITEM "&Rozdýlit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&JmÚno" , ID_VIEW_NAME MENUITEM "&Detaily vÜech soubor¨" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -85,7 +85,7 @@ MENUITEM "Nur St&ruktur" , 411 MENUITEM "Nur &Verzeichnis" , 412 MENUITEM SEPARATOR - MENUITEM "&Teilen" , 414 + MENUITEM "&Teilen" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "A&lle Dateiangaben" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -88,7 +88,7 @@ MENUITEM "Tr&ee Only" , 411 MENUITEM "Directory &Only" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&lit" , 414 + MENUITEM "Sp&lit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -84,7 +84,7 @@ MENUITEM "?rbol &s¾lo" , 411 MENUITEM "&Directorio s¾lo" , 412 MENUITEM SEPARATOR - MENUITEM "Di&vidir" , 414 + MENUITEM "Di&vidir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "No&mbre" , ID_VIEW_NAME MENUITEM "T&odos los detalles" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@ MENUITEM "&Arbre seulement" , 411 MENUITEM "&RÚpertoire seulement" , 412 MENUITEM SEPARATOR - MENUITEM "&SÚparer" , 414 + MENUITEM "&SÚparer" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nom" , ID_VIEW_NAME MENUITEM "Tous &les DÚtails" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@ MENUITEM "&K÷nyvtßrfa" , 411 MENUITEM "&Csak mappßk" , 412 MENUITEM SEPARATOR - MENUITEM "&Felosztßs" , 414 + MENUITEM "&Felosztßs" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&NÚv" , ID_VIEW_NAME MENUITEM "&Minden rÚszlet" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@ MENUITEM "So&lo Albero" , 411 MENUITEM "&Solo Directory" , 412 MENUITEM SEPARATOR - MENUITEM "Di&vidi" , 414 + MENUITEM "Di&vidi" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Mostra tutti i dettagli sui file" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -83,7 +83,7 @@ MENUITEM "&Alleen hierarchie" , 411 MENUITEM "Alleen &mapinhoud" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&litsen" , 414 + MENUITEM "Sp&litsen" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Naam" , ID_VIEW_NAME MENUITEM "&Alle details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@ MENUITEM "D&rzewo" , 411 MENUITEM "&Katalogi" , 412 MENUITEM SEPARATOR - MENUITEM "&Po??cz" , 414 + MENUITEM "&Po??cz" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nazwa" , ID_VIEW_NAME MENUITEM "&Wszystkie atrybuty pliku" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -86,7 +86,7 @@ MENUITEM "S&omente ßrvore" , 411 MENUITEM "So&mente pasta" , 412 MENUITEM SEPARATOR - MENUITEM "&Dividir" , 414 + MENUITEM "&Dividir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED @@ -214,7 +214,7 @@ MENUITEM "S&omente ßrvore" , 411 MENUITEM "So&mente pasta" , 412 MENUITEM SEPARATOR - MENUITEM "&Dividir" , 414 + MENUITEM "&Dividir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-21 16:45:50 UTC (rev 15460) @@ -53,6 +53,7 @@ #define ID_VIEW_SORT_TYPE 405 #define ID_VIEW_SORT_SIZE 406 #define ID_VIEW_SORT_DATE 407 +#define ID_VIEW_SPLIT 414 #define ID_SELECT_FONT 510 #define ID_VIEW_TOOL_BAR 508 #define ID_VIEW_DRIVE_BAR 507 _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -83,7 +83,7 @@ MENUITEM "Ê¯Ù³Û¯ &õÕÕÔ¯" , 411 MENUITEM "Ê¯Ù³Û¯ &´Ó´ÛÓ" , 412 MENUITEM SEPARATOR - MENUITEM "ðÓþ&ßÞ?³" , 414 + MENUITEM "ðÓþ&ßÞ?³" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "?&ý " , ID_VIEW_NAME MENUITEM "?&±Õ ´¯õ¯ßÝ¯±?Þ ¯ ¶ÓÚÙÕ" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -84,7 +84,7 @@ MENUITEM "Tr&ee Only" , 411 MENUITEM "Directory &Only" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&lit" , 414 + MENUITEM "Sp&lit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-21 16:45:50 UTC (rev 15460) @@ -211,7 +211,9 @@ /* globals */ WINEFILE_GLOBALS Globals; +static int last_split; + /* some common string constants */ const static TCHAR sEmpty[] = {'\0'}; const static TCHAR sSpace[] = {' ', '\0'}; @@ -346,6 +348,15 @@ if (hFind != INVALID_HANDLE_VALUE) { do { +#ifdef _NO_EXTENSIONS + /* hide directory entry "." */ + if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + LPCTSTR name = w32fd.cFileName; + + if (name[0]=='.' && name[1]=='\0') + continue; + } +#endif entry = alloc_entry(); if (!first_entry) @@ -361,15 +372,7 @@ entry->scanned = FALSE; entry->level = level; -#ifdef _NO_EXTENSIONS - /* hide directory entry "." */ - if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - LPCTSTR name = entry->data.cFileName; - - if (name[0]=='.' && name[1]=='\0') - continue; - } -#else +#ifndef _NO_EXTENSIONS entry->etype = ET_WINDOWS; entry->bhfi_valid = FALSE; @@ -387,9 +390,10 @@ #endif last = entry; - } while(FindNextFile(hFind, &entry->data)); + } while(FindNextFile(hFind, &w32fd)); - last->next = NULL; + if (last) + last->next = NULL; FindClose(hFind); } @@ -568,7 +572,8 @@ last = entry; } - last->next = NULL; + if (last) + last->next = NULL; call_closedir(pdir); } @@ -1219,7 +1224,7 @@ len++; if (len) { - array = (Entry**) HeapAlloc(GetProcessHeap(), 0, len*sizeof(Entry*)); + array = HeapAlloc(GetProcessHeap(), 0, len*sizeof(Entry*)); p = array; for(entry=dir->down; entry; entry=entry->next) @@ -1321,10 +1326,10 @@ static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, SORT_ORDER sortOrder, HWND hwnd) { - const static TCHAR sBackslash[] = {'\\', '\0'}; #if !defined(_NO_EXTENSIONS) && defined(__WINE__) const static TCHAR sSlash[] = {'/', '\0'}; #endif + const static TCHAR sBackslash[] = {'\\', '\0'}; #ifdef _SHELL_FOLDERS if (pidl) @@ -3397,7 +3402,9 @@ static void create_drive_bar() { TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}; +#ifndef _NO_EXTENSIONS TCHAR b1[BUFFER_LEN]; +#endif int btn = 1; PTSTR p; @@ -3755,8 +3762,6 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { - static int last_split; - ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA); ASSERT(child); @@ -3995,6 +4000,14 @@ set_sort_order(child, SORT_DATE); break; + case ID_VIEW_SPLIT: { + last_split = child->split_pos; +#ifdef _NO_EXTENSIONS + draw_splitbar(hwnd, last_split); +#endif + SetCapture(hwnd); + break;} + default: return pane_command(pane, LOWORD(wparam)); } @@ -4244,7 +4257,6 @@ TCHAR path[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; - TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; CLIENTCREATESTRUCT ccs; _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-05-21 16:45:50 UTC (rev 15460) @@ -50,12 +50,11 @@ #include <malloc.h> /* for alloca() */ #endif +#include <shellapi.h> /* for ShellExecute() */ +#include <shlobj.h> /* for SHFormatDrive() */ + #ifndef _NO_EXTENSIONS #define _SHELL_FOLDERS - -#include <objbase.h> -#include <shellapi.h> -#include <shlobj.h> #endif /* _NO_EXTENSIONS */ #ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -84,7 +84,7 @@ MENUITEM "¢÷¤È?¥?????¸ú¿&Eú®" , 411 MENUITEM "¢÷¤È?¥???????¦ú¿&Oú®" , 412 MENUITEM SEPARATOR - MENUITEM "ÀÍ©¯ú¿&Lú®" , 414 + MENUITEM "ÀÍ©¯ú¿&Lú®" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "?????¹?¹ú¿&Nú®" , ID_VIEW_NAME MENUITEM "????¤Û¤ñ?ð?Ýú¿&Aú®" , ID_VIEW_ALL_ATTRIBUTES, CHECKED

19 years, 4 months

[hpoussin] 15459: Remove some debug messages at boot (DPRINT1 changed to DPRINT)

by hpoussin＠svn.reactos.com

Remove some debug messages at boot (DPRINT1 changed to DPRINT) SVN maintenance in ntoskrnl/ex/: set svn:eol-style and svn:keywords properties Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -350,7 +350,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Registry Object Type\n"); + DPRINT("Creating Registry Object Type\n"); /* Initialize the Key object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/dbgctrl.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -39,7 +39,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Event Object Type\n"); + DPRINT("Creating Event Object Type\n"); /* Create the Event Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/event.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -36,7 +36,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Event Pair Object Type\n"); + DPRINT("Creating Event Pair Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/evtpair.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -52,7 +52,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Mutant Object Type\n"); + DPRINT("Creating Mutant Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/mutant.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/profile.c --- trunk/reactos/ntoskrnl/ex/profile.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/profile.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -9,6 +9,7 @@ /* INCLUDES *****************************************************************/ +#define NDEBUG #include <ntoskrnl.h> #include <internal/debug.h> @@ -81,7 +82,7 @@ /* Initialize the Mutex to lock the States */ KeInitializeMutex(&ExpProfileMutex, 0x40); - DPRINT1("Creating Profile Object Type\n"); + DPRINT("Creating Profile Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/profile.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -37,7 +37,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Semaphore Object Type\n"); + DPRINT("Creating Semaphore Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/sem.c ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + author date id revision _____ Modified: trunk/reactos/ntoskrnl/ex/timer.c --- trunk/reactos/ntoskrnl/ex/timer.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/timer.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -226,7 +226,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Timer Object Type\n"); + DPRINT("Creating Timer Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/timer.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -129,7 +129,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating window station Object Type\n"); + DPRINT("Creating window station Object Type\n"); /* Create the window station Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -90,7 +90,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Registry Object Type\n"); + DPRINT("Creating Registry Object Type\n"); /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -204,7 +204,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating IoCompletion Object Type\n"); + DPRINT("Creating IoCompletion Object Type\n"); /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -186,7 +186,7 @@ IopInitDriverImplementation(); - DPRINT1("Creating Device Object Type\n"); + DPRINT("Creating Device Object Type\n"); /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/lpc/port.c --- trunk/reactos/ntoskrnl/lpc/port.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/lpc/port.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -38,7 +38,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Port Object Type\n"); + DPRINT("Creating Port Object Type\n"); /* Create the Port Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -2117,7 +2117,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Section Object Type\n"); + DPRINT("Creating Section Object Type\n"); /* Initialize the Section object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/ob/symlink.c --- trunk/reactos/ntoskrnl/ob/symlink.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ob/symlink.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -136,7 +136,7 @@ UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - DPRINT1("Creating SymLink Object Type\n"); + DPRINT("Creating SymLink Object Type\n"); /* Initialize the Directory type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -12,6 +12,7 @@ /* Note: Jobs are only supported on Win2K+ */ /* INCLUDES *****************************************************************/ +#define NDEBUG #include <ntoskrnl.h> #include <internal/debug.h> @@ -61,7 +62,7 @@ UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - DPRINT1("Creating Job Object Type\n"); + DPRINT("Creating Job Object Type\n"); /* Initialize the Job type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -81,7 +81,7 @@ InitializeListHead(&PriorityListHead[i]); } - DPRINT1("Creating Thread Object Type\n"); + DPRINT("Creating Thread Object Type\n"); /* Initialize the Thread type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); @@ -124,7 +124,7 @@ * Register the process object type */ - DPRINT1("Creating Process Object Type\n"); + DPRINT("Creating Process Object Type\n"); /* Initialize the Thread type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/se/token.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -565,7 +565,7 @@ ExInitializeResource(&SepTokenLock); - DPRINT1("Creating Token Object Type\n"); + DPRINT("Creating Token Object Type\n"); /* Initialize the Token type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));

19 years, 4 months

[hpoussin] 15458: Open file with FILE_SHARE_READ in LdrLoadModule

by hpoussin＠svn.reactos.com

Open file with FILE_SHARE_READ in LdrLoadModule Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-21 13:39:09 UTC (rev 15457) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-21 15:49:48 UTC (rev 15458) @@ -309,7 +309,7 @@ GENERIC_READ, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); CHECKPOINT; if (!NT_SUCCESS(Status))

19 years, 4 months

[hbirr] 15457: Don't interpret STATUS_PIPE_CONNECTED as error.

by hbirr＠svn.reactos.com

Don't interpret STATUS_PIPE_CONNECTED as error. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-05-21 12:57:34 UTC (rev 15456) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-05-21 13:39:09 UTC (rev 15457) @@ -324,7 +324,8 @@ 0); /* return FALSE in case of failure and pending operations! */ - if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + if ((!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) || + Status == STATUS_PENDING) { SetLastErrorByStatus(Status); return FALSE; @@ -357,7 +358,7 @@ } } - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) { SetLastErrorByStatus(Status); return FALSE;

19 years, 4 months

[weiden] 15456: minor optimization

by weiden＠svn.reactos.com

minor optimization Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-05-21 12:23:07 UTC (rev 15455) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-05-21 12:57:34 UTC (rev 15456) @@ -53,9 +53,7 @@ "pushl %esp\n\t" \ "pushl %ebx\n\t" \ "call _KiInterruptDispatch\n\t" \ - "popl %eax\n\t" \ - "popl %eax\n\t" \ - "popl %eax\n\t" \ + "addl $0xC, %esp\n\t" \ "popl %gs\n\t" \ "popl %fs\n\t" \ "popl %es\n\t" \ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-05-21 12:23:07 UTC (rev 15455) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-05-21 12:57:34 UTC (rev 15456) @@ -21,9 +21,7 @@ pushl %esp pushl $(IRQ_BASE + 0) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -50,9 +48,7 @@ pushl %esp pushl $(IRQ_BASE + 1) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -79,9 +75,7 @@ pushl %esp pushl $(IRQ_BASE + 2) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -108,9 +102,7 @@ pushl %esp pushl $(IRQ_BASE + 3) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -137,9 +129,7 @@ pushl %esp pushl $(IRQ_BASE + 4) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -166,9 +156,7 @@ pushl %esp pushl $(IRQ_BASE + 5) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -195,9 +183,7 @@ pushl %esp pushl $(IRQ_BASE + 6) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -224,9 +210,7 @@ pushl %esp pushl $(IRQ_BASE + 7) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -253,9 +237,7 @@ pushl %esp pushl $(IRQ_BASE + 8) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -282,9 +264,7 @@ pushl %esp pushl $(IRQ_BASE + 9) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -311,9 +291,7 @@ pushl %esp pushl $(IRQ_BASE + 10) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -340,9 +318,7 @@ pushl %esp pushl $(IRQ_BASE + 11) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -369,9 +345,7 @@ pushl %esp pushl $(IRQ_BASE + 12) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -398,9 +372,7 @@ pushl %esp pushl $(IRQ_BASE + 13) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -427,9 +399,7 @@ pushl %esp pushl $(IRQ_BASE + 14) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -456,9 +426,7 @@ pushl %esp pushl $(IRQ_BASE + 15) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es

19 years, 4 months

[ekohl] 15455: Implement ConcatenatePaths and MyGetFileTitle.

by ekohl＠svn.reactos.com

Implement ConcatenatePaths and MyGetFileTitle. Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-05-21 12:21:30 UTC (rev 15454) +++ trunk/reactos/include/wine/setupapi.h 2005-05-21 12:23:07 UTC (rev 15455) @@ -669,6 +669,7 @@ VOID WINAPI AssertFail(LPSTR, UINT, LPSTR); DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst); +BOOL WINAPI ConcatenatePaths(LPWSTR, LPCWSTR, DWORD, LPDWORD); BOOL WINAPI DelayedMove(PCWSTR lpExistingFileName, PCWSTR lpNewFileName); BOOL WINAPI DoesUserHavePrivilege(PCWSTR lpPrivilegeName); PWSTR WINAPI DuplicateString(PCWSTR lpSrc); @@ -681,6 +682,7 @@ BOOL WINAPI IsUserAdmin(VOID); PWSTR WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage); VOID WINAPI MyFree(PVOID lpMem); +PWSTR WINAPI MyGetFileTitle(PCWSTR); PVOID WINAPI MyMalloc(DWORD dwSize); PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize); DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *); _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-05-21 12:21:30 UTC (rev 15454) +++ trunk/reactos/lib/setupapi/misc.c 2005-05-21 12:23:07 UTC (rev 15455) @@ -934,3 +934,113 @@ return dwError; } + + +/********************************************************************** **** + * MyGetFileTitle [SETUPAPI.@] + * + * Returns a pointer to the last part of a fully qualified file name. + * + * PARAMS + * lpFileName [I] File name + * + * RETURNS + * Pointer to a files name. + */ +LPWSTR WINAPI +MyGetFileTitle(LPCWSTR lpFileName) +{ + LPWSTR ptr; + LPWSTR ret; + WCHAR c; + + TRACE("%s\n", debugstr_w(lpFileName)); + + ptr = (LPWSTR)lpFileName; + ret = ptr; + while (TRUE) + { + c = *ptr; + + if (c == 0) + break; + + ptr++; + if (c == (WCHAR)'\\' || c == (WCHAR)'/' || c == (WCHAR)':') + ret = ptr; + } + + return ret; +} + + +/********************************************************************** **** + * ConcatenatePaths [SETUPAPI.@] + * + * Concatenates two paths. + * + * PARAMS + * lpPath [I/O] Path to append path to + * lpAppend [I] Path to append + * dwBufferSize [I] Size of the path buffer + * lpRequiredSize [O] Required size for the concatenated path. Optional + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI +ConcatenatePaths(LPWSTR lpPath, + LPCWSTR lpAppend, + DWORD dwBufferSize, + LPDWORD lpRequiredSize) +{ + DWORD dwPathSize; + DWORD dwAppendSize; + DWORD dwTotalSize; + BOOL bBackslash = FALSE; + + TRACE("%s %s %lu %p\n", debugstr_w(lpPath), debugstr_w(lpAppend), + dwBufferSize, lpRequiredSize); + + dwPathSize = lstrlenW(lpPath); + + /* Ignore trailing backslash */ + if (lpPath[dwPathSize - 1] == (WCHAR)'\\') + dwPathSize--; + + dwAppendSize = lstrlenW(lpAppend); + + /* Does the source string have a leading backslash? */ + if (lpAppend[0] == (WCHAR)'\\') + { + bBackslash = TRUE; + dwAppendSize--; + } + + dwTotalSize = dwPathSize + dwAppendSize + 2; + if (lpRequiredSize != NULL) + *lpRequiredSize = dwTotalSize; + + /* Append a backslash to the destination string */ + if (bBackslash == FALSE) + { + if (dwPathSize < dwBufferSize) + { + lpPath[dwPathSize - 1] = (WCHAR)'\\'; + dwPathSize++; + } + } + + if (dwPathSize + dwAppendSize < dwBufferSize) + { + lstrcpynW(&lpPath[dwPathSize], + lpAppend, + dwAppendSize); + } + + if (dwBufferSize >= dwTotalSize) + lpPath[dwTotalSize - 1] = 0; + + return (dwBufferSize >= dwTotalSize); +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-05-21 12:21:30 UTC (rev 15454) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-05-21 12:23:07 UTC (rev 15455) @@ -193,7 +193,7 @@ @ stdcall CaptureAndConvertAnsiArg(str ptr) @ stdcall CaptureStringArg(wstr ptr) @ stub CenterWindowRelativeToParent -@ stub ConcatenatePaths +@ stdcall ConcatenatePaths(wstr wstr long ptr) @ stdcall DelayedMove(wstr wstr) @ stub DelimStringToMultiSz @ stub DestroyTextFileReadBuffer @@ -220,7 +220,7 @@ @ stdcall MultiByteToUnicode(str long) @ stub MultiSzFromSearchControl @ stdcall MyFree(ptr) -@ stub MyGetFileTitle +@ stdcall MyGetFileTitle(wstr) @ stdcall MyMalloc(long) @ stdcall MyRealloc(ptr long) @ stdcall OpenAndMapFileForRead(wstr ptr ptr ptr ptr) @@ -424,8 +424,8 @@ @ stub SetupGetTargetPathW @ stdcall SetupInitDefaultQueueCallback(long) @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr) -@ stdcall SetupInitializeFileLogA (str long) -@ stdcall SetupInitializeFileLogW (wstr long) +@ stdcall SetupInitializeFileLogA(str long) +@ stdcall SetupInitializeFileLogW(wstr long) @ stub SetupInstallFileA @ stub SetupInstallFileExA @ stub SetupInstallFileExW

19 years, 4 months

[hbirr] 15454: Terminate the process on exit in NtProcessStartup.

by hbirr＠svn.reactos.com

Terminate the process on exit in NtProcessStartup. Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-05-21 12:19:26 UTC (rev 15453) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-05-21 12:21:30 UTC (rev 15454) @@ -3945,6 +3945,7 @@ /* Reboot */ FreeConsole(); NtShutdownSystem(ShutdownReboot); + NtTerminateProcess(NtCurrentProcess(), 0); } /* EOF */

19 years, 4 months

[hbirr] 15453: Free all allocated memory in ObpDeleteObject.

by hbirr＠svn.reactos.com

Free all allocated memory in ObpDeleteObject. Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-05-21 12:11:54 UTC (rev 15452) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-05-21 12:19:26 UTC (rev 15453) @@ -801,21 +801,30 @@ KEBUGCHECK(0); } + if (Header->ObjectType != NULL && + Header->ObjectType->TypeInfo.DeleteProcedure != NULL) + { + Header->ObjectType->TypeInfo.DeleteProcedure(HEADER_TO_BODY(Header)); + } + if (Header->SecurityDescriptor != NULL) { ObpRemoveSecurityDescriptor(Header->SecurityDescriptor); } - if (Header->NameInfo && Header->NameInfo->Name.Buffer) - { - ExFreePool(Header->NameInfo->Name.Buffer); - } - - if (Header->ObjectType != NULL && - Header->ObjectType->TypeInfo.DeleteProcedure != NULL) + if (Header->NameInfo) { - Header->ObjectType->TypeInfo.DeleteProcedure(HEADER_TO_BODY(Header)); + if(Header->NameInfo->Name.Buffer) + { + ExFreePool(Header->NameInfo->Name.Buffer); + } + ExFreePool(Header->NameInfo); } + if (Header->ObjectCreateInfo) + { + ObpReleaseCapturedAttributes(Header->ObjectCreateInfo); + ExFreePool(Header->ObjectCreateInfo); + } DPRINT("ObPerformRetentionChecks() = Freeing object\n"); ExFreePool(Header);

19 years, 4 months

[hbirr] 15452: Free the capture buffer in ObReferenceObjectByName.

by hbirr＠svn.reactos.com

Free the capture buffer in ObReferenceObjectByName. Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-21 12:08:46 UTC (rev 15451) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-21 12:11:54 UTC (rev 15452) @@ -76,13 +76,13 @@ NULL, NULL); - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(&ObjectAttributes, - AccessMode, - ObjectType, - &ObjectCreateInfo, - &ObjectName); + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(&ObjectAttributes, + AccessMode, + ObjectType, + &ObjectCreateInfo, + &ObjectName); if (!NT_SUCCESS(Status)) { DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); @@ -90,22 +90,23 @@ } Status = ObFindObject(&ObjectCreateInfo, - &ObjectName, + &ObjectName, &Object, &RemainingPath, ObjectType); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (!NT_SUCCESS(Status)) { return(Status); } -CHECKPOINT; -DPRINT("RemainingPath.Buffer '%S' Object %p\n", RemainingPath.Buffer, Object); + DPRINT("RemainingPath.Buffer '%S' Object %p\n", RemainingPath.Buffer, Object); if (RemainingPath.Buffer != NULL || Object == NULL) { -CHECKPOINT; -DPRINT("Object %p\n", Object); + DPRINT("Object %p\n", Object); *ObjectPtr = NULL; RtlFreeUnicodeString (&RemainingPath); return(STATUS_OBJECT_NAME_NOT_FOUND); @@ -177,22 +178,22 @@ } Status = ObFindObject(&ObjectCreateInfo, - &ObjectName, + &ObjectName, &Object, &RemainingPath, ObjectType); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { DPRINT("ObFindObject() failed (Status %lx)\n", Status); return Status; } - DPRINT("OBject: %x, Remaining Path: %wZ\n", Object, &RemainingPath); + DPRINT("OBject: %x, Remaining Path: %wZ\n", Object, &RemainingPath); if (Object == NULL) { RtlFreeUnicodeString(&RemainingPath); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return STATUS_UNSUCCESSFUL; } if (RemainingPath.Buffer != NULL) @@ -203,8 +204,6 @@ Status =STATUS_OBJECT_PATH_NOT_FOUND; RtlFreeUnicodeString(&RemainingPath); ObDereferenceObject(Object); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return Status; } @@ -216,8 +215,6 @@ ObDereferenceObject(Object); RtlFreeUnicodeString(&RemainingPath); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return Status; }

19 years, 4 months

[hbirr] 15451: Set the flag FO_DIRECT_DEVICE_OPEN after the call to IoCreateStreamFileObject in IoCreateFile.

by hbirr＠svn.reactos.com

Set the flag FO_DIRECT_DEVICE_OPEN after the call to IoCreateStreamFileObject in IoCreateFile. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-21 11:29:53 UTC (rev 15450) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-21 12:08:46 UTC (rev 15451) @@ -877,6 +877,10 @@ } /* FIXME: wt... */ FileObject = IoCreateStreamFileObject(NULL, DeviceObject); + /* HACK */ + FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + DPRINT("%wZ\n", ObjectAttributes->ObjectName); + ObDereferenceObject (DeviceObject); } } @@ -1145,8 +1149,6 @@ CreatedFileObject->DeviceObject = DeviceObject; CreatedFileObject->Vpb = DeviceObject->Vpb; CreatedFileObject->Type = IO_TYPE_FILE; - /* HACK */ - CreatedFileObject->Flags |= FO_DIRECT_DEVICE_OPEN; CreatedFileObject->Flags |= FO_STREAM_FILE; /* Initialize Lock and Event */

19 years, 4 months

← Newer
1
...
23
24
25
26
27
28
29
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005