Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 75454: [ACPPAGE] Fix the shell extension asking to add an empty layer.
by mjansen＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: mjansen Date: Sun Jul 30 12:46:53 2017 New Revision: 75454 URL: http://svn.reactos.org/svn/reactos?rev=75454&view=rev Log: [ACPPAGE] Fix the shell extension asking to add an empty layer. Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Sun Jul 30 12:46:53 2017 @@ -455,7 +455,7 @@ Index = ListBox_AddString(List, Str); ListBox_SetCurSel(List, Index); ListboxChanged(hWnd); - ComboBox_SetText(Combo, TEXT("")); + ComboBox_SetCurSel(Combo, -1); SetFocus(Combo); } @@ -523,6 +523,7 @@ ListBox_GetText(List, Cur, Str); ListBox_DeleteString(List, Cur); HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); + ComboBox_SetCurSel(Combo, -1); ComboBox_SetText(Combo, Str); ListboxChanged(hWnd); ComboBox_SetEditSel(Combo, 30000, 30000);

1 0

[tfaber] 75453: [0.4.6] - Merge NFS symbolic link fix (r75451) by Pierre CORE-13615
by tfaber＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: tfaber Date: Sun Jul 30 12:40:24 2017 New Revision: 75453 URL: http://svn.reactos.org/svn/reactos?rev=75453&view=rev Log: [0.4.6] - Merge NFS symbolic link fix (r75451) by Pierre CORE-13615 Modified: branches/ros-branch-0_4_6/ (props changed) branches/ros-branch-0_4_6/reactos/ (props changed) branches/ros-branch-0_4_6/reactos/sdk/lib/drivers/rdbsslib/rdbss.c Propchange: branches/ros-branch-0_4_6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jul 30 12:40:24 2017 @@ -1 +1,2 @@ /branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595 +/trunk:75451 Propchange: branches/ros-branch-0_4_6/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jul 30 12:40:24 2017 @@ -23,3 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 +/trunk/reactos:75451 Modified: branches/ros-branch-0_4_6/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/sdk/li… ============================================================================== --- branches/ros-branch-0_4_6/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_6/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Sun Jul 30 12:40:24 2017 @@ -7492,6 +7492,9 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI RxPrepareToReparseSymbolicLink( @@ -7501,8 +7504,74 @@ BOOLEAN NewPathIsAbsolute, PBOOLEAN ReparseRequired) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PWSTR NewBuffer; + USHORT NewLength; + PFILE_OBJECT FileObject; + + /* Assume no reparse is required first */ + *ReparseRequired = FALSE; + + /* Only supported for IRP_MJ_CREATE */ + if (RxContext->MajorFunction != IRP_MJ_CREATE) + { + return STATUS_INVALID_PARAMETER; + } + + /* If symbolic link is not embedded, and DELETE is specified, fail */ + if (!SymbolicLinkEmbeddedInOldPath) + { + /* Excepted if DELETE is the only flag specified, then, open has to succeed + * See: https://msdn.microsoft.com/en-us/library/windows/hardware/ff554649(v=vs.85)… (remarks) + */ + if (BooleanFlagOn(RxContext->Create.NtCreateParameters.DesiredAccess, DELETE) && + BooleanFlagOn(RxContext->Create.NtCreateParameters.DesiredAccess, ~DELETE)) + { + return STATUS_ACCESS_DENIED; + } + } + + /* At that point, assume reparse will be required */ + *ReparseRequired = TRUE; + + /* If new path isn't absolute, it's up to us to make it absolute */ + if (!NewPathIsAbsolute) + { + /* The prefix will be \Device\Mup */ + NewLength = NewPath->Length + (sizeof(L"\\Device\\Mup") - sizeof(UNICODE_NULL)); + NewBuffer = ExAllocatePoolWithTag(PagedPool | POOL_COLD_ALLOCATION, NewLength, + RX_MISC_POOLTAG); + if (NewBuffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy data for the new path */ + RtlMoveMemory(NewBuffer, L"\\Device\\Mup", (sizeof(L"\\Device\\Mup") - sizeof(UNICODE_NULL))); + RtlMoveMemory(Add2Ptr(NewBuffer, (sizeof(L"\\Device\\Mup") - sizeof(UNICODE_NULL))), + NewPath->Buffer, NewPath->Length); + } + /* Otherwise, use caller path as it */ + else + { + NewLength = NewPath->Length; + NewBuffer = NewPath->Buffer; + } + + /* Get the FILE_OBJECT we'll modify */ + FileObject = RxContext->CurrentIrpSp->FileObject; + + /* Free old path first */ + ExFreePoolWithTag(FileObject->FileName.Buffer, 0); + /* And setup new one */ + FileObject->FileName.Length = NewLength; + FileObject->FileName.MaximumLength = NewLength; + FileObject->FileName.Buffer = NewBuffer; + + /* And set reparse flag */ + SetFlag(RxContext->Create.Flags, RX_CONTEXT_CREATE_FLAG_REPARSE); + + /* Done! */ + return STATUS_SUCCESS; } /*

1 0

[tfaber] 75452: [0.4.6] - Revert r73436 to avoid trouble with VirtualBox Guest Additions. CORE-13172 CORE-12700 CORE-12765
by tfaber＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: tfaber Date: Sun Jul 30 12:34:54 2017 New Revision: 75452 URL: http://svn.reactos.org/svn/reactos?rev=75452&view=rev Log: [0.4.6] - Revert r73436 to avoid trouble with VirtualBox Guest Additions. CORE-13172 CORE-12700 CORE-12765 Modified: branches/ros-branch-0_4_6/reactos/dll/win32/shell32/iconcache.cpp branches/ros-branch-0_4_6/reactos/dll/win32/shell32/shell32.cpp branches/ros-branch-0_4_6/reactos/dll/win32/shell32/wine/shellord.c Modified: branches/ros-branch-0_4_6/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_6/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_6/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Sun Jul 30 12:34:54 2017 @@ -453,9 +453,6 @@ sice.dwSourceIndex = dwSourceIndex; sice.dwFlags = dwFlags; - if (!sic_hdpa) - SIC_Initialize(); - EnterCriticalSection(&SHELL32_SicCS); if (NULL != DPA_GetPtr (sic_hdpa, 0)) @@ -690,9 +687,6 @@ RegCloseKey(hKeyShellIcons); } - if (!sic_hdpa) - SIC_Initialize(); - return SIC_LoadIcon(iconPath, iconIdx, 0); } @@ -704,17 +698,13 @@ * */ BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) -{ - TRACE("(%p,%p)\n",lpBigList,lpSmallList); - - if (!sic_hdpa) - SIC_Initialize(); - +{ TRACE("(%p,%p)\n",lpBigList,lpSmallList); if (lpBigList) - *lpBigList = ShellBigIconList; - + { *lpBigList = ShellBigIconList; + } if (lpSmallList) - *lpSmallList = ShellSmallIconList; + { *lpSmallList = ShellSmallIconList; + } return TRUE; } @@ -744,9 +734,6 @@ int iShortcutDefaultIndex = INVALID_INDEX; TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); - - if (!sic_hdpa) - SIC_Initialize(); if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei)))) { Modified: branches/ros-branch-0_4_6/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_6/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_6/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Sun Jul 30 12:34:54 2017 @@ -340,6 +340,7 @@ InitCommonControlsEx(&InitCtrls); /* Bad idea, initialization in DllMain! */ + SIC_Initialize(); InitChangeNotifications(); } else if (dwReason == DLL_PROCESS_DETACH) Modified: branches/ros-branch-0_4_6/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_6/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_6/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Sun Jul 30 12:34:54 2017 @@ -1296,8 +1296,8 @@ * */ BOOL WINAPI FileIconInit(BOOL bFullInit) -{ - return SIC_Initialize(); +{ FIXME("(%s)\n", bFullInit ? "true" : "false"); + return FALSE; } /*************************************************************************

1 0

[pschweitzer] 75451: [RDBSS] Implement RxPrepareToReparseSymbolicLink(). This allows symbolic links to work on a NFS share, we can now follow links that would have been exported by the server. Safe...
by pschweitzer＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: pschweitzer Date: Sun Jul 30 12:24:26 2017 New Revision: 75451 URL: http://svn.reactos.org/svn/reactos?rev=75451&view=rev Log: [RDBSS] Implement RxPrepareToReparseSymbolicLink(). This allows symbolic links to work on a NFS share, we can now follow links that would have been exported by the server. Safe to merge. CORE-8204 CORE-11327 CORE-13615 Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Sun Jul 30 12:24:26 2017 @@ -7492,6 +7492,9 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI RxPrepareToReparseSymbolicLink( @@ -7501,8 +7504,74 @@ BOOLEAN NewPathIsAbsolute, PBOOLEAN ReparseRequired) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PWSTR NewBuffer; + USHORT NewLength; + PFILE_OBJECT FileObject; + + /* Assume no reparse is required first */ + *ReparseRequired = FALSE; + + /* Only supported for IRP_MJ_CREATE */ + if (RxContext->MajorFunction != IRP_MJ_CREATE) + { + return STATUS_INVALID_PARAMETER; + } + + /* If symbolic link is not embedded, and DELETE is specified, fail */ + if (!SymbolicLinkEmbeddedInOldPath) + { + /* Excepted if DELETE is the only flag specified, then, open has to succeed + * See: https://msdn.microsoft.com/en-us/library/windows/hardware/ff554649(v=vs.85)… (remarks) + */ + if (BooleanFlagOn(RxContext->Create.NtCreateParameters.DesiredAccess, DELETE) && + BooleanFlagOn(RxContext->Create.NtCreateParameters.DesiredAccess, ~DELETE)) + { + return STATUS_ACCESS_DENIED; + } + } + + /* At that point, assume reparse will be required */ + *ReparseRequired = TRUE; + + /* If new path isn't absolute, it's up to us to make it absolute */ + if (!NewPathIsAbsolute) + { + /* The prefix will be \Device\Mup */ + NewLength = NewPath->Length + (sizeof(L"\\Device\\Mup") - sizeof(UNICODE_NULL)); + NewBuffer = ExAllocatePoolWithTag(PagedPool | POOL_COLD_ALLOCATION, NewLength, + RX_MISC_POOLTAG); + if (NewBuffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy data for the new path */ + RtlMoveMemory(NewBuffer, L"\\Device\\Mup", (sizeof(L"\\Device\\Mup") - sizeof(UNICODE_NULL))); + RtlMoveMemory(Add2Ptr(NewBuffer, (sizeof(L"\\Device\\Mup") - sizeof(UNICODE_NULL))), + NewPath->Buffer, NewPath->Length); + } + /* Otherwise, use caller path as it */ + else + { + NewLength = NewPath->Length; + NewBuffer = NewPath->Buffer; + } + + /* Get the FILE_OBJECT we'll modify */ + FileObject = RxContext->CurrentIrpSp->FileObject; + + /* Free old path first */ + ExFreePoolWithTag(FileObject->FileName.Buffer, 0); + /* And setup new one */ + FileObject->FileName.Length = NewLength; + FileObject->FileName.MaximumLength = NewLength; + FileObject->FileName.Buffer = NewBuffer; + + /* And set reparse flag */ + SetFlag(RxContext->Create.Flags, RX_CONTEXT_CREATE_FLAG_REPARSE); + + /* Done! */ + return STATUS_SUCCESS; } /*

1 0

[tfaber] 75450: [0.4.6] - Apply the WordPad icon hack by Jared Smudde CORE-5823
by tfaber＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: tfaber Date: Sun Jul 30 11:03:35 2017 New Revision: 75450 URL: http://svn.reactos.org/svn/reactos?rev=75450&view=rev Log: [0.4.6] - Apply the WordPad icon hack by Jared Smudde CORE-5823 Modified: branches/ros-branch-0_4_6/reactos/base/applications/wordpad/res/formatbar.bmp branches/ros-branch-0_4_6/reactos/base/applications/wordpad/res/toolbar.bmp Modified: branches/ros-branch-0_4_6/reactos/base/applications/wordpad/res/formatbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/base/a… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_6/reactos/base/applications/wordpad/res/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/base/a… ============================================================================== Binary files - no diff available.

1 0

[tfaber] 75449: [0.4.6] - Mask WndProc exceptions CORE-11915
by tfaber＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: tfaber Date: Sun Jul 30 10:58:32 2017 New Revision: 75449 URL: http://svn.reactos.org/svn/reactos?rev=75449&view=rev Log: [0.4.6] - Mask WndProc exceptions CORE-11915 Modified: branches/ros-branch-0_4_6/reactos/win32ss/user/user32/windows/message.c Modified: branches/ros-branch-0_4_6/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_6/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_6/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sun Jul 30 10:58:32 2017 @@ -1463,20 +1463,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) { @@ -1517,20 +1512,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) { @@ -1609,20 +1599,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) { @@ -1670,20 +1655,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) {

1 0

[tfaber] 75448: [0.4.6] - Set version number for RC1
by tfaber＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: tfaber Date: Sun Jul 30 10:54:52 2017 New Revision: 75448 URL: http://svn.reactos.org/svn/reactos?rev=75448&view=rev Log: [0.4.6] - Set version number for RC1 Modified: branches/ros-branch-0_4_6/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_6/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/sdk/in… ============================================================================== --- branches/ros-branch-0_4_6/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_6/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Sun Jul 30 10:54:52 2017 @@ -17,15 +17,15 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "5") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "4") +set(KERNEL_VERSION_PATCH_LEVEL "6") set(COPYRIGHT_YEAR "2017") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "RC1") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

1 0

[dquintana] 75447: [EXPLORER] Update start menu banner.
by dquintana＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: dquintana Date: Sun Jul 30 10:53:23 2017 New Revision: 75447 URL: http://svn.reactos.org/svn/reactos?rev=75447&view=rev Log: [EXPLORER] Update start menu banner. Modified: branches/ros-branch-0_4_6/reactos/base/shell/explorer/res/bmp/158.bmp branches/ros-branch-0_4_6/reactos/base/shell/explorer/res/src/start_menu_banner.svg Modified: branches/ros-branch-0_4_6/reactos/base/shell/explorer/res/bmp/158.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_6/reactos/base/shell/explorer/res/src/start_menu_banner.svg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_6/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_6/reactos/base/shell/explorer/res/src/start_menu_banner.svg [iso-8859-1] (original) +++ branches/ros-branch-0_4_6/reactos/base/shell/explorer/res/src/start_menu_banner.svg [iso-8859-1] Sun Jul 30 10:53:23 2017 @@ -16,8 +16,8 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Logo.svg" - inkscape:export-filename="F:\reactos\Logo.png" + sodipodi:docname="start_menu_banner.svg" + inkscape:export-filename="F:\reactos\sources\base\shell\explorer\res\src\banner-0.4.6-rc1.png" inkscape:export-xdpi="72" inkscape:export-ydpi="72"> <defs @@ -117,16 +117,16 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="2.4967109" - inkscape:cx="-34.214085" - inkscape:cy="142.13217" + inkscape:cx="-54.841222" + inkscape:cy="126.11109" inkscape:document-units="px" inkscape:current-layer="svg2" showgrid="false" units="pt" inkscape:window-width="1397" inkscape:window-height="974" - inkscape:window-x="437" - inkscape:window-y="214" + inkscape:window-x="353" + inkscape:window-y="208" inkscape:window-maximized="0" /> <metadata id="metadata7"> @@ -136,7 +136,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -171,7 +171,7 @@ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.00007629px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4213">ReactOS</tspan><tspan style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.50006676px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" - id="tspan4209"> 0.5 - SVN</tspan></tspan></text> + id="tspan4209"> 0.4.6 RC1</tspan></tspan></text> <g style="fill:#ffffff;fill-opacity:1" id="layer1-2"

1 0

[tfaber] 75446: [0.4.6] - Branch for the release
by tfaber＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: tfaber Date: Sun Jul 30 10:26:29 2017 New Revision: 75446 URL: http://svn.reactos.org/svn/reactos?rev=75446&view=rev Log: [0.4.6] - Branch for the release Added: branches/ros-branch-0_4_6/ (props changed) - copied from r75445, trunk/ Propchange: branches/ros-branch-0_4_6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jul 30 10:26:29 2017 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595

1 0

[pschweitzer] 75445: [RDBSS] When CcFlushCache fails, properly set status before leaving. CORE-11327
by pschweitzer＠svn.reactos.org 30 Jul '17

30 Jul '17

Author: pschweitzer Date: Sun Jul 30 08:54:09 2017 New Revision: 75445 URL: http://svn.reactos.org/svn/reactos?rev=75445&view=rev Log: [RDBSS] When CcFlushCache fails, properly set status before leaving. CORE-11327 Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Sun Jul 30 08:54:09 2017 @@ -3188,6 +3188,7 @@ if (!NT_SUCCESS(Irp->IoStatus.Status)) { + Status = Irp->IoStatus.Status; _SEH2_LEAVE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs