Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cwittich] 40519: check for immutable bits in RtlSetControlSecurityDescriptor fixes >100 advapi32 security winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Apr 15 12:33:57 2009 New Revision: 40519 URL: http://svn.reactos.org/svn/reactos?rev=40519&view=rev Log: check for immutable bits in RtlSetControlSecurityDescriptor fixes >100 advapi32 security winetests Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=40519&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Wed Apr 15 12:33:57 2009 @@ -667,6 +667,13 @@ IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { + SECURITY_DESCRIPTOR_CONTROL const immutable + = SE_OWNER_DEFAULTED | SE_GROUP_DEFAULTED + | SE_DACL_PRESENT | SE_DACL_DEFAULTED + | SE_SACL_PRESENT | SE_SACL_DEFAULTED + | SE_RM_CONTROL_VALID | SE_SELF_RELATIVE + ; + PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; PAGED_CODE_RTL(); @@ -675,6 +682,9 @@ { return STATUS_UNKNOWN_REVISION; } + + if ((ControlBitsOfInterest | ControlBitsToSet) & immutable) + return STATUS_INVALID_PARAMETER; /* Zero the 'bits of interest' */ pSD->Control &= ~ControlBitsOfInterest;

15 years, 9 months

[fireball] 40518: - Silence MmCanFileBeTruncated warning about not checking for outstanding write probes.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 15 11:47:15 2009 New Revision: 40518 URL: http://svn.reactos.org/svn/reactos?rev=40518&view=rev Log: - Silence MmCanFileBeTruncated warning about not checking for outstanding write probes. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Apr 15 11:47:15 2009 @@ -4754,7 +4754,7 @@ } } - DPRINT1("FIXME: didn't check for outstanding write probes\n"); + DPRINT("FIXME: didn't check for outstanding write probes\n"); return TRUE; }

15 years, 9 months

[dchapyshev] 40517: - Sync avifil32 with Wine 1.1.19

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Apr 15 11:33:50 2009 New Revision: 40517 URL: http://svn.reactos.org/svn/reactos?rev=40517&view=rev Log: - Sync avifil32 with Wine 1.1.19 Removed: trunk/reactos/dll/win32/avifil32/avifile.spec Modified: trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/wavfile.c Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Wed Apr 15 11:33:50 2009 @@ -172,7 +172,6 @@ /*********************************************************************** * AVIFileInit (AVIFIL32.@) - * AVIFileInit (AVIFILE.100) */ void WINAPI AVIFileInit(void) { OleInitialize(NULL); @@ -180,7 +179,6 @@ /*********************************************************************** * AVIFileExit (AVIFIL32.@) - * AVIFileExit (AVIFILE.101) */ void WINAPI AVIFileExit(void) { /* need to free ole32.dll if we are the last exit call */ @@ -191,7 +189,6 @@ /*********************************************************************** * AVIFileOpen (AVIFIL32.@) * AVIFileOpenA (AVIFIL32.@) - * AVIFileOpen (AVIFILE.102) */ HRESULT WINAPI AVIFileOpenA(PAVIFILE *ppfile, LPCSTR szFile, UINT uMode, LPCLSID lpHandler) @@ -276,7 +273,6 @@ /*********************************************************************** * AVIFileAddRef (AVIFIL32.@) - * AVIFileAddRef (AVIFILE.140) */ ULONG WINAPI AVIFileAddRef(PAVIFILE pfile) { @@ -292,7 +288,6 @@ /*********************************************************************** * AVIFileRelease (AVIFIL32.@) - * AVIFileRelease (AVIFILE.141) */ ULONG WINAPI AVIFileRelease(PAVIFILE pfile) { @@ -309,7 +304,6 @@ /*********************************************************************** * AVIFileInfo (AVIFIL32.@) * AVIFileInfoA (AVIFIL32.@) - * AVIFileInfo (AVIFILE.142) */ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size) { @@ -348,7 +342,6 @@ /*********************************************************************** * AVIFileGetStream (AVIFIL32.@) - * AVIFileGetStream (AVIFILE.143) */ HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis, DWORD fccType, LONG lParam) @@ -364,7 +357,6 @@ /*********************************************************************** * AVIFileCreateStream (AVIFIL32.@) * AVIFileCreateStreamA (AVIFIL32.@) - * AVIFileCreateStream (AVIFILE.144) */ HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE pfile, PAVISTREAM *ppavi, LPAVISTREAMINFOA psi) @@ -400,7 +392,6 @@ /*********************************************************************** * AVIFileWriteData (AVIFIL32.@) - * AVIFileWriteData (AVIFILE.146) */ HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size) { @@ -414,7 +405,6 @@ /*********************************************************************** * AVIFileReadData (AVIFIL32.@) - * AVIFileReadData (AVIFILE.147) */ HRESULT WINAPI AVIFileReadData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LPLONG size) { @@ -428,7 +418,6 @@ /*********************************************************************** * AVIFileEndRecord (AVIFIL32.@) - * AVIFileEndRecord (AVIFILE.148) */ HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile) { @@ -442,7 +431,6 @@ /*********************************************************************** * AVIStreamAddRef (AVIFIL32.@) - * AVIStreamAddRef (AVIFILE.160) */ ULONG WINAPI AVIStreamAddRef(PAVISTREAM pstream) { @@ -458,7 +446,6 @@ /*********************************************************************** * AVIStreamRelease (AVIFIL32.@) - * AVIStreamRelease (AVIFILE.161) */ ULONG WINAPI AVIStreamRelease(PAVISTREAM pstream) { @@ -474,7 +461,6 @@ /*********************************************************************** * AVIStreamCreate (AVIFIL32.@) - * AVIStreamCreate (AVIFILE.104) */ HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2, LPCLSID pclsidHandler) @@ -507,7 +493,6 @@ /*********************************************************************** * AVIStreamInfo (AVIFIL32.@) * AVIStreamInfoA (AVIFIL32.@) - * AVIStreamInfo (AVIFILE.162) */ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, LONG size) @@ -548,7 +533,6 @@ /*********************************************************************** * AVIStreamFindSample (AVIFIL32.@) - * AVIStreamFindSample (AVIFILE.163) */ LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags) { @@ -562,7 +546,6 @@ /*********************************************************************** * AVIStreamReadFormat (AVIFIL32.@) - * AVIStreamReadFormat (AVIFILE.164) */ HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos, LPVOID format, LPLONG formatsize) @@ -577,7 +560,6 @@ /*********************************************************************** * AVIStreamSetFormat (AVIFIL32.@) - * AVIStreamSetFormat (AVIFILE.169) */ HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM pstream, LONG pos, LPVOID format, LONG formatsize) @@ -592,7 +574,6 @@ /*********************************************************************** * AVIStreamRead (AVIFIL32.@) - * AVIStreamRead (AVIFILE.167) */ HRESULT WINAPI AVIStreamRead(PAVISTREAM pstream, LONG start, LONG samples, LPVOID buffer, LONG buffersize, @@ -610,7 +591,6 @@ /*********************************************************************** * AVIStreamWrite (AVIFIL32.@) - * AVIStreamWrite (AVIFILE.168) */ HRESULT WINAPI AVIStreamWrite(PAVISTREAM pstream, LONG start, LONG samples, LPVOID buffer, LONG buffersize, DWORD flags, @@ -628,7 +608,6 @@ /*********************************************************************** * AVIStreamReadData (AVIFIL32.@) - * AVIStreamReadData (AVIFILE.165) */ HRESULT WINAPI AVIStreamReadData(PAVISTREAM pstream, DWORD fcc, LPVOID lp, LPLONG lpread) @@ -643,7 +622,6 @@ /*********************************************************************** * AVIStreamWriteData (AVIFIL32.@) - * AVIStreamWriteData (AVIFILE.166) */ HRESULT WINAPI AVIStreamWriteData(PAVISTREAM pstream, DWORD fcc, LPVOID lp, LONG size) @@ -658,7 +636,6 @@ /*********************************************************************** * AVIStreamGetFrameOpen (AVIFIL32.@) - * AVIStreamGetFrameOpen (AVIFILE.112) */ PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pstream, LPBITMAPINFOHEADER lpbiWanted) @@ -684,7 +661,6 @@ /*********************************************************************** * AVIStreamGetFrame (AVIFIL32.@) - * AVIStreamGetFrame (AVIFILE.110) */ LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg, LONG pos) { @@ -698,7 +674,6 @@ /*********************************************************************** * AVIStreamGetFrameClose (AVIFIL32.@) - * AVIStreamGetFrameClose (AVIFILE.111) */ HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg) { @@ -782,7 +757,6 @@ /*********************************************************************** * AVIStreamOpenFromFile (AVIFIL32.@) * AVIStreamOpenFromFileA (AVIFIL32.@) - * AVIStreamOpenFromFile (AVIFILE.103) */ HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile, DWORD fccType, LONG lParam, @@ -880,7 +854,6 @@ } /*********************************************************************** - * AVIStreamStart (AVIFILE.130) * AVIStreamStart (AVIFIL32.@) */ LONG WINAPI AVIStreamStart(PAVISTREAM pstream) @@ -899,7 +872,6 @@ } /*********************************************************************** - * AVIStreamLength (AVIFILE.131) * AVIStreamLength (AVIFIL32.@) */ LONG WINAPI AVIStreamLength(PAVISTREAM pstream) @@ -918,7 +890,6 @@ } /*********************************************************************** - * AVIStreamSampleToTime (AVIFILE.133) * AVIStreamSampleToTime (AVIFIL32.@) */ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample) @@ -952,7 +923,6 @@ } /*********************************************************************** - * AVIStreamTimeToSample (AVIFILE.132) * AVIStreamTimeToSample (AVIFIL32.@) */ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime) @@ -988,7 +958,6 @@ /*********************************************************************** * AVIBuildFilter (AVIFIL32.@) * AVIBuildFilterA (AVIFIL32.@) - * AVIBuildFilter (AVIFILE.123) */ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving) { @@ -1515,7 +1484,6 @@ /*********************************************************************** * AVISaveOptionsFree (AVIFIL32.@) - * AVISaveOptionsFree (AVIFILE.124) */ HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions) { Removed: trunk/reactos/dll/win32/avifil32/avifile.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.spec (removed) @@ -1,64 +1,0 @@ -# I'm just using "long" instead of "ptr" for the interface pointers, -# because they are 32-bit pointers, not converted to 16-bit format, -# but the app doesn't really need to know, it should never need to -# dereference the interface pointer itself (if we're lucky)... - -#1 stub WEP -2 stub DLLGETCLASSOBJECT -3 stub DLLCANUNLOADNOW -4 stub ___EXPORTEDSTUB -10 stub _IID_IAVISTREAM -11 stub _IID_IAVIFILE -12 stub _IID_IAVIEDITSTREAM -13 stub _IID_IGETFRAME -14 stub _CLSID_AVISIMPLEUNMARSHAL -100 pascal AVIFileInit() AVIFileInit -101 pascal AVIFileExit() AVIFileExit -102 pascal AVIFileOpen(ptr str word ptr) AVIFileOpenA -103 pascal AVIStreamOpenFromFile(ptr str long long word ptr) AVIStreamOpenFromFileA -104 pascal AVIStreamCreate(ptr long long ptr) AVIStreamCreate -105 stub AVIMAKECOMPRESSEDSTREAM -106 stub AVIMAKEFILEFROMSTREAMS -107 stub AVIMAKESTREAMFROMCLIPBOARD -110 pascal AVIStreamGetFrame(long long) AVIStreamGetFrame -111 pascal AVIStreamGetFrameClose(long) AVIStreamGetFrameClose -112 pascal AVIStreamGetFrameOpen(long ptr) AVIStreamGetFrameOpen -120 stub _AVISAVE -121 stub AVISAVEV -122 stub AVISAVEOPTIONS -123 pascal AVIBuildFilter(str long word) AVIBuildFilterA -124 pascal AVISaveOptionsFree(word ptr) AVISaveOptionsFree -130 pascal AVIStreamStart(long) AVIStreamStart -131 pascal AVIStreamLength(long) AVIStreamLength -132 pascal AVIStreamTimeToSample(long long) AVIStreamTimeToSample -133 pascal AVIStreamSampleToTime(long long) AVIStreamSampleToTime -140 pascal AVIFileAddRef(long) AVIFileAddRef -141 pascal AVIFileRelease(long) AVIFileRelease -142 pascal AVIFileInfo(long ptr long) AVIFileInfoA -143 pascal AVIFileGetStream(long ptr long long) AVIFileGetStream -144 pascal AVIFileCreateStream(long ptr ptr) AVIFileCreateStreamA -146 pascal AVIFileWriteData(long long ptr long) AVIFileWriteData -147 pascal AVIFileReadData(long long ptr ptr) AVIFileReadData -148 pascal AVIFileEndRecord(long) AVIFileEndRecord -160 pascal AVIStreamAddRef(long) AVIStreamAddRef -161 pascal AVIStreamRelease(long) AVIStreamRelease -162 pascal AVIStreamInfo(long ptr long) AVIStreamInfoA -163 pascal AVIStreamFindSample(long long long) AVIStreamFindSample -164 pascal AVIStreamReadFormat(long long ptr ptr) AVIStreamReadFormat -165 pascal AVIStreamReadData(long long ptr ptr) AVIStreamReadData -166 pascal AVIStreamWriteData(long long ptr long) AVIStreamWriteData -167 pascal AVIStreamRead(long long long ptr long ptr ptr) AVIStreamRead -168 pascal AVIStreamWrite(long long long ptr long long ptr ptr) AVIStreamWrite -169 pascal AVIStreamSetFormat(long long ptr long) AVIStreamSetFormat -180 stub EDITSTREAMCOPY -181 stub EDITSTREAMCUT -182 stub EDITSTREAMPASTE -184 stub CREATEEDITABLESTREAM -185 stub AVIPUTFILEONCLIPBOARD -187 stub AVIGETFROMCLIPBOARD -188 stub AVICLEARCLIPBOARD -190 stub EDITSTREAMCLONE -191 stub EDITSTREAMSETNAME -192 stub EDITSTREAMSETINFO -200 stub AVISTREAMBEGINSTREAMING -201 stub AVISTREAMENDSTREAMING Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Wed Apr 15 11:33:50 2009 @@ -140,6 +140,7 @@ if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IGetFrame, refiid)) { *obj = iface; + IGetFrame_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] Wed Apr 15 11:33:50 2009 @@ -251,13 +251,16 @@ if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIFile, refiid)) { *obj = iface; + IAVIFile_AddRef(iface); return S_OK; } else if (This->fInfo.dwStreams == 1 && IsEqualGUID(&IID_IAVIStream, refiid)) { *obj = &This->iAVIStream; + IAVIFile_AddRef(iface); return S_OK; } else if (IsEqualGUID(&IID_IPersistFile, refiid)) { *obj = &This->iPersistFile; + IAVIFile_AddRef(iface); return S_OK; }

15 years, 9 months

[dchapyshev] 40516: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Apr 15 11:29:19 2009 New Revision: 40516 URL: http://svn.reactos.org/svn/reactos?rev=40516&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Wed Apr 15 11:29:19 2009 @@ -53,7 +53,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Öâåòîâàÿ ñõåìà:", IDC_STATIC, 7, 139, 154, 10 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 155, 200 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Ýôôåêòû...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 168, 170, 70, 14 END @@ -98,24 +98,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Ýôôåêòû" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Ïðèìåíÿòü ñëåäóþùèé ïåðåõîäíûé ýôôåêò äëÿ ìåíþ è ïîäñêàçîê:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "Ïð&èìåíÿòü ñëåäóþùèé ìåòîä ñãëàæèâàíèÿ äëÿ ýêðàííûõ øðèôòîâ:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Ïðèìåíÿòü &êðóïíûå çíà÷êè",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Îòîáðàæàòü &òåíè, îòáðàñûâàåìûå ìåíþ",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "&Îòîáðàæàòü ñîäåðæèìîå îêíà ïðè ïåðåòàñêèâàíèè",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "Ñêð&ûâàòü óêàçàòåëè âûçîâà ñ êëàâèàòóðû äî íàæàòèÿ <Alt>",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -178,13 +178,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" + IDS_SLIDEEFFECT "Ðàçâåðòûâàíèå" + IDS_FADEEFFECT "Çàòåìíåíèå" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Îáû÷íûé" IDS_CLEARTYPEEFFECT "ClearType" END @@ -248,7 +248,7 @@ IDS_ELEMENT_13 "Ñòðîêà çàãîëîâêà" IDS_ELEMENT_14 "Íåàêòèâíûå ïóíêòû ìåíþ" IDS_ELEMENT_15 "Äèàëîã" - IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_16 "Ïîëîñû ïðîêðóòêè" IDS_ELEMENT_17 "Ðàáî÷àÿ îáëàñòü ïðèëîæåíèÿ" IDS_ELEMENT_18 "Small captionbar" IDS_ELEMENT_19 "Èíòåðâàë ìåæäó çíà÷êàìè (ãîð.)" @@ -259,7 +259,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "Display settings" - IDS_APPLY_FAILED "Failed to apply new settings..." - IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_DISPLAY_SETTINGS "Ïàðàìåòðû ýêðàíà" + IDS_APPLY_FAILED "Íå óäàëîñü ïðèìåíèòü íîâûå íàñòðîéêè..." + IDS_APPLY_NEEDS_RESTART "Âû äîëæíû ïåðåçàãðóçèòü êîìïüþòåð äëÿ ïðèìåíåíèÿ èçìåíåíèé." +END

15 years, 9 months

[cwittich] 40515: try to fix the sysreg hangs

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Apr 15 11:23:37 2009 New Revision: 40515 URL: http://svn.reactos.org/svn/reactos?rev=40515&view=rev Log: try to fix the sysreg hangs Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40515&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Wed Apr 15 11:23:37 2009 @@ -98,6 +98,13 @@ if (*bp == '\33') goto cleanup; } + else + { + /* KDBG doesn't send a newline */ + if ((strstr(buf, "kdb:>")) || + (strstr(buf, "--- Press q"))) + break; + } ++bp; }

15 years, 9 months

[dgoette] 369: * merge comp/comp_group.php and comp/comp_group_maintainer.php to HTML_Group.class.php * merge comp/comp_item_details.php and comp/comp_item_details_maintainer.php to Item_Details.class.php * get comp/comp_item_bugs.php, comp/comp_item_forum.php, comp/comp_item_screenshots.php, comp/comp_item_tests.php, comp/comp_item_tips.php to Item_* as class structure * move inc/comp to nocomp (will be deleted later) * get inc/comp/data to lib/get/List_* (will be a class structure later) * mer

by dgoette＠svn.reactos.org

15 years, 9 months

[cwittich] 40514: check for ESC in the while loop otherwise we never reached the old check

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Apr 15 08:36:50 2009 New Revision: 40514 URL: http://svn.reactos.org/svn/reactos?rev=40514&view=rev Log: check for ESC in the while loop otherwise we never reached the old check Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40514&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Wed Apr 15 08:36:50 2009 @@ -92,6 +92,13 @@ if(*bp == '\n') break; + if (fds[i].fd == STDIN_FILENO) + { + /* break on ESC */ + if (*bp == '\33') + goto cleanup; + } + ++bp; } @@ -105,13 +112,7 @@ *(++bp) = 0; /* Now check the output */ - if (fds[i].fd == STDIN_FILENO) - { - /* Check whether the user pressed ESC and cancel in that case */ - if (strchr(buf, '\33')) - goto cleanup; - } - else + if (fds[i].fd != STDIN_FILENO) { /* Check for "magic" sequences */ if (strstr(buf, "kdb:>"))

15 years, 9 months

[cfinck] 40513: - Use rundll32.exe and CreateProcessAsUserW to call ClientSideInstallW for installing new devices and supply all required information over a named pipe. The named pipe communication was monitored under Windows XP SP2, so that the protocol under ReactOS is compatible (except for one data field, see code) - Implement ClientSideInstallW in newdev.dll - Give umpnpmgr the SE_ASSIGNPRIMARYTOKEN privilege to use CreateProcessAsUserW - Open the token of the userinit process with TOKEN_AS

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Apr 15 02:31:36 2009 New Revision: 40513 URL: http://svn.reactos.org/svn/reactos?rev=40513&view=rev Log: - Use rundll32.exe and CreateProcessAsUserW to call ClientSideInstallW for installing new devices and supply all required information over a named pipe. The named pipe communication was monitored under Windows XP SP2, so that the protocol under ReactOS is compatible (except for one data field, see code) - Implement ClientSideInstallW in newdev.dll - Give umpnpmgr the SE_ASSIGNPRIMARYTOKEN privilege to use CreateProcessAsUserW - Open the token of the userinit process with TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY, we don't get TOKEN_ALL_ACCESS and used to fail here without noticing it - Return CR_FAILURE in case of problems inside PNP_ReportLogOn This stuff by the way fixes the "Browse" button in a "New hardware device" dialog See issue #4363 for more details. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild trunk/reactos/dll/win32/newdev/newdev.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Wed Apr 15 02:31:36 2009 @@ -23,19 +23,23 @@ * PURPOSE: User-mode Plug and Play manager * PROGRAMMER: Eric Kohl * Hervé Poussineau (hpoussin(a)reactos.org) + * Colin Finck (colin(a)reactos.org) */ /* INCLUDES *****************************************************************/ //#define HAVE_SLIST_ENTRY_IMPLEMENTED #define WIN32_NO_STATUS #include <windows.h> +#include <stdio.h> #include <cmtypes.h> #include <cmfuncs.h> #include <rtlfuncs.h> +#include <setypes.h> #include <umpnpmgr/sysguid.h> #include <wdmguid.h> #include <cfgmgr32.h> #include <regstr.h> +#include <userenv.h> #include <rpc.h> #include <rpcdce.h> @@ -222,6 +226,7 @@ BOOL Admin, DWORD ProcessId) { + DWORD ReturnValue = CR_FAILURE; HANDLE hProcess; UNREFERENCED_PARAMETER(hBinding); @@ -233,28 +238,37 @@ SetEvent(hInstallEvent); /* Get the users token */ - hProcess = OpenProcess(PROCESS_ALL_ACCESS, - TRUE, - ProcessId); - if (hProcess != NULL) - { - if (hUserToken != NULL) - { - CloseHandle(hUserToken); - hUserToken = NULL; - } - - OpenProcessToken(hProcess, - TOKEN_ALL_ACCESS, - &hUserToken); - CloseHandle(hProcess); + hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, ProcessId); + + if(!hProcess) + { + DPRINT1("OpenProcess failed with error %u\n", GetLastError()); + goto cleanup; + } + + if (hUserToken) + { + CloseHandle(hUserToken); + hUserToken = NULL; + } + + if(!OpenProcessToken(hProcess, TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY, &hUserToken)) + { + DPRINT1("OpenProcessToken failed with error %u\n", GetLastError()); + goto cleanup; } /* Trigger the installer thread */ /*if (hInstallEvent != NULL) SetEvent(hInstallEvent);*/ - return CR_SUCCESS; + ReturnValue = CR_SUCCESS; + +cleanup: + if(hProcess) + CloseHandle(hProcess); + + return ReturnValue; } @@ -1900,18 +1914,29 @@ } -typedef BOOL (WINAPI *PDEV_INSTALL_W)(HWND, HINSTANCE, LPCWSTR, INT); - static BOOL InstallDevice(PCWSTR DeviceInstance, BOOL ShowWizard) { PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; - HMODULE hNewDev = NULL; - PDEV_INSTALL_W DevInstallW; NTSTATUS Status; BOOL DeviceInstalled = FALSE; + DWORD BytesWritten; + DWORD Value; + HANDLE hPipe = INVALID_HANDLE_VALUE; + LPVOID Environment = NULL; + PROCESS_INFORMATION ProcessInfo; + STARTUPINFOW StartupInfo; + UUID RandomUuid; + + /* The following lengths are constant (see below), they cannot overflow */ + WCHAR CommandLine[116]; + WCHAR InstallEventName[73]; + WCHAR PipeName[74]; + WCHAR UuidString[39]; DPRINT("InstallDevice(%S, %d)\n", DeviceInstance, ShowWizard); + + ZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); RtlInitUnicodeString(&PlugPlayData.DeviceInstance, DeviceInstance); @@ -1934,34 +1959,109 @@ return TRUE; } - /* Install device */ - SetEnvironmentVariableW(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ - - hNewDev = LoadLibraryW(L"newdev.dll"); - if (!hNewDev) - { - DPRINT1("Unable to load newdev.dll\n"); + /* Create a random UUID for the named pipe */ + UuidCreate(&RandomUuid); + swprintf(UuidString, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + RandomUuid.Data1, RandomUuid.Data2, RandomUuid.Data3, + RandomUuid.Data4[0], RandomUuid.Data4[1], RandomUuid.Data4[2], + RandomUuid.Data4[3], RandomUuid.Data4[4], RandomUuid.Data4[5], + RandomUuid.Data4[6], RandomUuid.Data4[7]); + + /* Create the named pipe */ + wcscpy(PipeName, L"\\\\.\\pipe\\PNP_Device_Install_Pipe_0."); + wcscat(PipeName, UuidString); + hPipe = CreateNamedPipeW(PipeName, PIPE_ACCESS_OUTBOUND, PIPE_TYPE_BYTE, 1, 512, 512, 0, NULL); + + if(hPipe == INVALID_HANDLE_VALUE) + { + DPRINT1("CreateNamedPipeW failed with error %u\n", GetLastError()); goto cleanup; } - DevInstallW = (PDEV_INSTALL_W)GetProcAddress(hNewDev, (LPCSTR)"DevInstallW"); - if (!DevInstallW) - { - DPRINT1("'DevInstallW' not found in newdev.dll\n"); + /* Launch rundll32 to call ClientSideInstallW */ + wcscpy(CommandLine, L"rundll32.exe newdev.dll,ClientSideInstall "); + wcscat(CommandLine, PipeName); + + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); + + if(hUserToken) + { + /* newdev has to run under the environment of the current user */ + if(!CreateEnvironmentBlock(&Environment, hUserToken, FALSE)) + { + DPRINT1("CreateEnvironmentBlock failed with error %d\n", GetLastError()); + goto cleanup; + } + + if(!CreateProcessAsUserW(hUserToken, NULL, CommandLine, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, Environment, NULL, &StartupInfo, &ProcessInfo)) + { + DPRINT1("CreateProcessAsUserW failed with error %u\n", GetLastError()); + goto cleanup; + } + } + else + { + /* FIXME: This is probably not correct, I guess newdev should never be run with SYSTEM privileges. + + Still, we currently do that in 2nd stage setup and probably Console mode as well, so allow it here. + (ShowWizard is only set to FALSE for these two modes) */ + ASSERT(!ShowWizard); + + if(!CreateProcessW(NULL, CommandLine, NULL, NULL, FALSE, 0, NULL, NULL, &StartupInfo, &ProcessInfo)) + { + DPRINT1("CreateProcessW failed with error %u\n", GetLastError()); + goto cleanup; + } + } + + /* Wait for the function to connect to our pipe */ + if(!ConnectNamedPipe(hPipe, NULL)) + { + DPRINT1("ConnectNamedPipe failed with error %u\n", GetLastError()); goto cleanup; } - if (!DevInstallW(NULL, NULL, DeviceInstance, ShowWizard ? SW_SHOWNOACTIVATE : SW_HIDE)) - { - DPRINT1("DevInstallW('%S') failed\n", DeviceInstance); + /* Pass the data. The following output is partly compatible to Windows XP SP2 (researched using a modified newdev.dll to log this stuff) */ + wcscpy(InstallEventName, L"Global\\PNP_Device_Install_Event_0."); + wcscat(InstallEventName, UuidString); + + Value = sizeof(InstallEventName); + WriteFile(hPipe, &Value, sizeof(Value), &BytesWritten, NULL); + WriteFile(hPipe, InstallEventName, Value, &BytesWritten, NULL); + + /* I couldn't figure out what the following value means under WinXP. It's usually 0 in my tests, but was also 5 once. + Therefore the following line is entirely ReactOS-specific. We use the value here to pass the ShowWizard variable. */ + WriteFile(hPipe, &ShowWizard, sizeof(ShowWizard), &BytesWritten, NULL); + + Value = (wcslen(DeviceInstance) + 1) * sizeof(WCHAR); + WriteFile(hPipe, &Value, sizeof(Value), &BytesWritten, NULL); + WriteFile(hPipe, DeviceInstance, Value, &BytesWritten, NULL); + + /* Wait for newdev.dll to finish processing */ + WaitForSingleObject(ProcessInfo.hProcess, INFINITE); + + /* The following check for success is probably not compatible to Windows, but should do its job */ + if(!GetExitCodeProcess(ProcessInfo.hProcess, &Value)) + { + DPRINT1("GetExitCodeProcess failed with error %u\n", GetLastError()); goto cleanup; } - DeviceInstalled = TRUE; + DeviceInstalled = Value; cleanup: - if (hNewDev != NULL) - FreeLibrary(hNewDev); + if(hPipe != INVALID_HANDLE_VALUE) + CloseHandle(hPipe); + + if(Environment) + DestroyEnvironmentBlock(Environment); + + if(ProcessInfo.hProcess) + CloseHandle(ProcessInfo.hProcess); + + if(ProcessInfo.hThread) + CloseHandle(ProcessInfo.hThread); return DeviceInstalled; } @@ -2255,12 +2355,16 @@ int wmain(int argc, WCHAR *argv[]) { + BOOLEAN OldValue; DWORD dwError; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); DPRINT("Umpnpmgr: main() started\n"); + + /* We need this privilege for using CreateProcessAsUserW */ + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &OldValue); hInstallEvent = CreateEvent(NULL, TRUE, SetupIsActive()/*FALSE*/, NULL); if (hInstallEvent == NULL) Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild [iso-8859-1] Wed Apr 15 02:31:36 2009 @@ -11,6 +11,7 @@ <library>rpcrt4</library> <library>pseh</library> <library>wdmguid</library> + <library>userenv</library> <file>umpnpmgr.c</file> <file>umpnpmgr.rc</file> </module> Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Wed Apr 15 02:31:36 2009 @@ -3,6 +3,7 @@ * * Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) * 2005 Christoph von Wittich (Christoph(a)ActiveVB.de) + * 2009 Colin Finck (colin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -803,7 +804,7 @@ } /* -* @unimplemented +* @implemented */ BOOL WINAPI ClientSideInstallW( @@ -811,11 +812,75 @@ IN DWORD dwUnknownFlags, IN LPWSTR lpNamedPipeName) { - /* NOTE: pNamedPipeName is in the format: - * "\\.\pipe\PNP_Device_Install_Pipe_0.{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" - */ - FIXME("Stub\n"); - return FALSE; + BOOL ReturnValue = FALSE; + BOOL ShowWizard; + DWORD BytesRead; + DWORD Value; + HANDLE hPipe = INVALID_HANDLE_VALUE; + PWSTR DeviceInstance = NULL; + PWSTR InstallEventName = NULL; + + /* Open the pipe */ + hPipe = CreateFileW(lpNamedPipeName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if(hPipe == INVALID_HANDLE_VALUE) + { + ERR("CreateFileW failed with error %u\n", GetLastError()); + goto cleanup; + } + + /* Read the data. Some is just included for compatibility with Windows right now and not yet used by ReactOS. + See umpnpmgr for more details. */ + if(!ReadFile(hPipe, &Value, sizeof(Value), &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + InstallEventName = (PWSTR)HeapAlloc(GetProcessHeap(), 0, Value); + + if(!ReadFile(hPipe, InstallEventName, Value, &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + /* I couldn't figure out what the following value means under Windows XP. + Therefore I used it in umpnpmgr to pass the ShowWizard variable. */ + if(!ReadFile(hPipe, &ShowWizard, sizeof(ShowWizard), &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + /* Next one is again size in bytes of the following string */ + if(!ReadFile(hPipe, &Value, sizeof(Value), &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + DeviceInstance = (PWSTR)HeapAlloc(GetProcessHeap(), 0, Value); + + if(!ReadFile(hPipe, DeviceInstance, Value, &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + ReturnValue = DevInstallW(NULL, NULL, DeviceInstance, ShowWizard ? SW_SHOWNOACTIVATE : SW_HIDE); + +cleanup: + if(hPipe != INVALID_HANDLE_VALUE) + CloseHandle(hPipe); + + if(InstallEventName) + HeapFree(GetProcessHeap(), 0, InstallEventName); + + if(DeviceInstance) + HeapFree(GetProcessHeap(), 0, DeviceInstance); + + return ReturnValue; } BOOL WINAPI

15 years, 9 months

[cfinck] 40512: Fix and slightly optimize _SHGetUserShellFolderPath Note to Wine guys: Registry functions take and give everything in bytes!

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Apr 15 02:13:20 2009 New Revision: 40512 URL: http://svn.reactos.org/svn/reactos?rev=40512&view=rev Log: Fix and slightly optimize _SHGetUserShellFolderPath Note to Wine guys: Registry functions take and give everything in bytes! Modified: trunk/reactos/dll/win32/shell32/shellpath.c Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Wed Apr 15 02:13:20 2009 @@ -924,7 +924,7 @@ HRESULT hr; WCHAR shellFolderPath[MAX_PATH], userShellFolderPath[MAX_PATH]; LPCWSTR pShellFolderPath, pUserShellFolderPath; - DWORD dwDisp, dwType, dwPathLen = MAX_PATH; + DWORD dwDisp, dwType, dwPathLen; HKEY userShellFolderKey, shellFolderKey; TRACE("%p,%s,%s,%p\n",rootKey, debugstr_w(userPrefix), debugstr_w(value), @@ -962,21 +962,25 @@ return E_FAIL; } + dwPathLen = MAX_PATH * sizeof(WCHAR); + if (!RegQueryValueExW(userShellFolderKey, value, NULL, &dwType, (LPBYTE)path, &dwPathLen) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) { LONG ret; - path[dwPathLen / sizeof(WCHAR)] = '\0'; + dwPathLen /= sizeof(WCHAR); + + path[dwPathLen] = '\0'; if (dwType == REG_EXPAND_SZ && path[0] == '%') { WCHAR szTemp[MAX_PATH]; - ExpandEnvironmentStringsW(path, szTemp, MAX_PATH); - lstrcpynW(path, szTemp, MAX_PATH); - } - ret = RegSetValueExW(shellFolderKey, value, 0, REG_SZ, (LPBYTE)path, - (wcslen(path) + 1) * sizeof(WCHAR)); + dwPathLen = ExpandEnvironmentStringsW(path, szTemp, MAX_PATH); + lstrcpynW(path, szTemp, dwPathLen); + } + + ret = RegSetValueExW(shellFolderKey, value, 0, REG_SZ, (LPBYTE)path, dwPathLen * sizeof(WCHAR)); if (ret != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(ret); else @@ -984,6 +988,7 @@ } else hr = E_FAIL; + RegCloseKey(shellFolderKey); RegCloseKey(userShellFolderKey); TRACE("returning 0x%08x\n", hr);

15 years, 9 months

[cfinck] 40511: Don't miss the last byte when we have nothing more to read

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Apr 15 01:53:25 2009 New Revision: 40511 URL: http://svn.reactos.org/svn/reactos?rev=40511&view=rev Log: Don't miss the last byte when we have nothing more to read Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40511&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Wed Apr 15 01:53:25 2009 @@ -72,8 +72,8 @@ bp = buf; - /* Read one line or a maximum of 512 bytes into a buffer */ - while (bp - buf < sizeof(buf)) + /* Read one line or a maximum of 511 bytes into a buffer (leave space for the null character) */ + while (bp - buf < sizeof(buf) - 1) { got = read(fds[i].fd, bp, 1); @@ -89,8 +89,10 @@ } /* Also break on newlines */ - if(*bp++ == '\n') + if(*bp == '\n') break; + + ++bp; } if (bp == buf) @@ -99,8 +101,8 @@ Ret = EXIT_SHUTDOWN; goto cleanup; } - - *bp = 0; + + *(++bp) = 0; /* Now check the output */ if (fds[i].fd == STDIN_FILENO)

15 years, 9 months

← Newer
1
...
24
25
26
27
28
29
30
...
48
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 April 2009