Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[pschweitzer] 72098: [NET/USE] In case an automatic drive letter assignment was asked (net use * REMOTE), print the mapping that was performed on success. ROSAPPS-303

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Aug 3 14:42:49 2016 New Revision: 72098 URL: http://svn.reactos.org/svn/reactos?rev=72098&view=rev Log: [NET/USE] In case an automatic drive letter assignment was asked (net use * REMOTE), print the mapping that was performed on success. ROSAPPS-303 Modified: trunk/reactos/base/applications/network/net/cmdUse.c Modified: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Wed Aug 3 14:42:49 2016 @@ -8,6 +8,8 @@ */ #include "net.h" + +#define COUNT_OF(a) (sizeof(a) / sizeof(a[0])) static DWORD @@ -130,6 +132,8 @@ { BOOL Persist = FALSE; NETRESOURCE lpNet; + WCHAR Access[256]; + DWORD OutFlags = 0, Size = COUNT_OF(Access); Len = wcslen(argv[3]); if (Len < 4) @@ -186,6 +190,10 @@ lpNet.lpRemoteName = argv[3]; lpNet.lpProvider = NULL; - return WNetAddConnection2(&lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0)); + Status = WNetUseConnection(NULL, &lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0), Access, &Size, &OutFlags); + if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags == CONNECT_LOCALDRIVE) + printf("%S is now connected to %S\n", argv[3], Access); + + return Status; } }

8 years, 4 months

[pschweitzer] 72097: [MPR] Return the correct local name in case of automatic redirection. Alreaedy sent upstream. CORE-11757

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Aug 3 14:41:23 2016 New Revision: 72097 URL: http://svn.reactos.org/svn/reactos?rev=72097&view=rev Log: [MPR] Return the correct local name in case of automatic redirection. Alreaedy sent upstream. CORE-11757 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Wed Aug 3 14:41:23 2016 @@ -1918,7 +1918,7 @@ else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); - if (redirect) + if (ret != NO_ERROR && redirect) letter[0] -= 1; } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'c');

8 years, 4 months

[pschweitzer] 72096: [FASTFAT] Fixes suggested by Thomas: - Don't dereference cached data after unpinning - Pin big enough data to read direntries CORE-11377

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Aug 3 12:54:46 2016 New Revision: 72096 URL: http://svn.reactos.org/svn/reactos?rev=72096&view=rev Log: [FASTFAT] Fixes suggested by Thomas: - Don't dereference cached data after unpinning - Pin big enough data to read direntries CORE-11377 Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Wed Aug 3 12:54:46 2016 @@ -100,7 +100,7 @@ Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; _SEH2_TRY { - CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FATX_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry); + CcPinRead(pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, PIN_WAIT, &Context, (PVOID*)&pDirEntry); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -118,15 +118,16 @@ RtlUnicodeStringToOemString(&NameA, FileName, FALSE); pDirEntry->FilenameLength = (unsigned char)NameA.Length; - CcSetDirtyPinnedData(Context, NULL); - CcUnpinData(Context); - /* Update FCB */ DirContext.ShortNameU.Length = 0; DirContext.ShortNameU.MaximumLength = 0; DirContext.ShortNameU.Buffer = NULL; DirContext.LongNameU = *FileName; DirContext.DirEntry.FatX = *pDirEntry; + + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + Status = vfatUpdateFCB(DeviceExt, pFcb, &DirContext, pFcb->parentFcb); if (NT_SUCCESS(Status)) { @@ -862,7 +863,7 @@ Offset.u.LowPart = (i * sizeof(FAT_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; _SEH2_TRY { - CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FAT_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry); + CcPinRead(pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, PIN_WAIT, &Context, (PVOID*)&pDirEntry); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -878,13 +879,8 @@ (PDIR_ENTRY)&pDirEntry[i % (PAGE_SIZE / sizeof(FAT_DIR_ENTRY))]); } } - if (Context) - { - CcSetDirtyPinnedData(Context, NULL); - CcUnpinData(Context); - } - - /* In case of moving, don't delete data */ + + /* In case of moving, save properties */ if (MoveContext != NULL) { pDirEntry = &pDirEntry[pFcb->dirIndex % (PAGE_SIZE / sizeof(FAT_DIR_ENTRY))]; @@ -893,7 +889,15 @@ MoveContext->CreationTime = pDirEntry->CreationTime; MoveContext->CreationDate = pDirEntry->CreationDate; } - else + + if (Context) + { + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + } + + /* In case of moving, don't delete data */ + if (MoveContext == NULL) { while (CurrentCluster && CurrentCluster != 0xffffffff) { @@ -934,7 +938,7 @@ Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; _SEH2_TRY { - CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FATX_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry); + CcPinRead(pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, PIN_WAIT, &Context, (PVOID*)&pDirEntry); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -946,10 +950,8 @@ pDirEntry->FilenameLength = 0xe5; CurrentCluster = vfatDirEntryGetFirstCluster(DeviceExt, (PDIR_ENTRY)pDirEntry); - CcSetDirtyPinnedData(Context, NULL); - CcUnpinData(Context); - - /* In case of moving, don't delete data */ + + /* In case of moving, save properties */ if (MoveContext != NULL) { MoveContext->FirstCluster = CurrentCluster; @@ -957,7 +959,12 @@ MoveContext->CreationTime = pDirEntry->CreationTime; MoveContext->CreationDate = pDirEntry->CreationDate; } - else + + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + + /* In case of moving, don't delete data */ + if (MoveContext == NULL) { while (CurrentCluster && CurrentCluster != 0xffffffff) {

8 years, 4 months

[akhaldi] 72095: [0.4.2] * Merge the notepad Danish translation improvement by Hermès in r72078.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 2 17:35:51 2016 New Revision: 72095 URL: http://svn.reactos.org/svn/reactos?rev=72095&view=rev Log: [0.4.2] * Merge the notepad Danish translation improvement by Hermès in r72078. Modified: branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 2 17:35:51 2016 @@ -20,4 +20,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:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067,72092 +/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067,72078,72092 Modified: branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] Tue Aug 2 17:35:51 2016 @@ -23,8 +23,8 @@ POPUP "&Fil" BEGIN MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "Ã&bn\tEnter", CMD_OPEN - MENUITEM "&Gem", CMD_SAVE + MENUITEM "Ã&bn...\tCtrl+O", CMD_OPEN + MENUITEM "&Gem\tCtrl+S", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "Side&opsÃ¦tning...", CMD_PAGE_SETUP

8 years, 4 months

[akhaldi] 72094: [0.4.2] * Merge the browseui disc names fix by Christoph in r72092. CORE-11458

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 2 17:21:30 2016 New Revision: 72094 URL: http://svn.reactos.org/svn/reactos?rev=72094&view=rev Log: [0.4.2] * Merge the browseui disc names fix by Christoph in r72092. CORE-11458 Modified: branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 2 17:21:30 2016 @@ -20,4 +20,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:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067 +/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063,72067,72092 Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Tue Aug 2 17:21:30 2016 @@ -350,7 +350,7 @@ /* Get the name of the node */ WCHAR wszDisplayName[MAX_PATH]; - if (!ILGetDisplayNameEx(psfParent, pEltRelative, wszDisplayName, ILGDN_INFOLDER)) + if (!ILGetDisplayNameEx(psfParent, pElt, wszDisplayName, ILGDN_INFOLDER)) { ERR("Failed to get node name\n"); return NULL;

8 years, 4 months

[hbelusca] 72093: [WIN32K] - Deduplicate NtUserScrollWindowEx / IntScrollWindowEx by making NtUserScrollWindowEx properly call IntScrollWindowEx instead. - Fix potential memory leaks in failure pat...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 2 16:02:54 2016 New Revision: 72093 URL: http://svn.reactos.org/svn/reactos?rev=72093&view=rev Log: [WIN32K] - Deduplicate NtUserScrollWindowEx / IntScrollWindowEx by making NtUserScrollWindowEx properly call IntScrollWindowEx instead. - Fix potential memory leaks in failure paths in IntScrollWindowEx. Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] Tue Aug 2 16:02:54 2016 @@ -238,8 +238,8 @@ LPRECT prcUpdate, UINT flags) { + INT Result; RECTL rcScroll, rcClip, rcCaret; - INT Result; PWND CaretWnd; HDC hDC; PREGION RgnUpdate = NULL, RgnTemp, RgnWinupd = NULL; @@ -248,19 +248,20 @@ int rdw_flags; USER_REFERENCE_ENTRY CaretRef; + if (!Window || !IntIsWindowDrawable(Window)) + { + return ERROR; + } + IntGetClientRect(Window, &rcClip); if (prcScroll) - { RECTL_bIntersectRect(&rcScroll, &rcClip, prcScroll); - } else rcScroll = rcClip; if (prcClip) - { RECTL_bIntersectRect(&rcClip, &rcClip, prcClip); - } if (rcClip.right <= rcClip.left || rcClip.bottom <= rcClip.top || (dx == 0 && dy == 0)) @@ -283,7 +284,8 @@ if (!RgnTemp) { EngSetLastError(ERROR_INVALID_HANDLE); - return ERROR; + Result = ERROR; + goto Cleanup; } IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); REGION_UnlockRgn(RgnTemp); @@ -311,7 +313,8 @@ if (!hDC) { /* FIXME: SetLastError? */ - return ERROR; + Result = ERROR; + goto Cleanup; } rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; @@ -339,7 +342,8 @@ if (!RgnTemp) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return ERROR; + Result = ERROR; + goto Cleanup; } if (co_IntGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) @@ -349,7 +353,8 @@ { if (hrgnUpdate) { - RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); + RgnWinupd = IntSysCreateRectpRgn(0, 0, 0, 0); + // FIXME: What to do if RgnWinupd == NULL?? IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); } @@ -381,10 +386,7 @@ for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { rcChild = Child->rcWindow; - rcChild.left -= ClientOrigin.x; - rcChild.top -= ClientOrigin.y; - rcChild.right -= ClientOrigin.x; - rcChild.bottom -= ClientOrigin.y; + RECTL_vOffsetRect(&rcChild, -ClientOrigin.x, -ClientOrigin.y); if (!prcScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) { @@ -396,9 +398,9 @@ lParam = MAKELONG(rcChild.left + dx, rcChild.top + dy); /* wine sends WM_POSCHANGING, WM_POSCHANGED messages */ - /* windows sometimes a WM_MOVE */ + /* windows sometimes a WM_MOVE */ co_IntSendMessage(UserHMGetHandle(Child), WM_MOVE, 0, lParam); - + UserDerefObjectCo(Child); } } @@ -436,6 +438,7 @@ REGION_UnlockRgn(RgnTemp); } +Cleanup: if (RgnWinupd) { REGION_Delete(RgnWinupd); @@ -478,9 +481,9 @@ LPRECT prcUnsafeUpdate) { DECLARE_RETURN(DWORD); + DWORD Result; + NTSTATUS Status = STATUS_SUCCESS; RECTL rcScroll, rcClip, rcUpdate; - NTSTATUS Status = STATUS_SUCCESS; - DWORD Result; TRACE("Enter NtUserScrollDC\n"); UserEnterExclusive(); @@ -506,7 +509,8 @@ { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -516,14 +520,14 @@ Result = UserScrollDC( hDC, dx, dy, - prcUnsafeScroll? &rcScroll : 0, - prcUnsafeClip? &rcClip : 0, + prcUnsafeScroll ? &rcScroll : NULL, + prcUnsafeClip ? &rcClip : NULL, hrgnUpdate, NULL, - prcUnsafeUpdate? &rcUpdate : NULL); + prcUnsafeUpdate ? &rcUpdate : NULL); if(Result == ERROR) { - /* FIXME: Only if hRgnUpdate is invalid we should SetLastError(ERROR_INVALID_HANDLE) */ + /* FIXME: Only if hRgnUpdate is invalid we should SetLastError(ERROR_INVALID_HANDLE) */ RETURN(FALSE); } @@ -537,7 +541,8 @@ { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; + if (!NT_SUCCESS(Status)) { /* FIXME: SetLastError? */ @@ -572,17 +577,12 @@ LPRECT prcUnsafeUpdate, UINT flags) { - RECTL rcScroll, rcClip, rcCaret, rcUpdate; + DECLARE_RETURN(DWORD); INT Result; - PWND Window = NULL, CaretWnd; - HDC hDC; - PREGION RgnUpdate = NULL, RgnTemp, RgnWinupd = NULL; - HWND hwndCaret; - DWORD dcxflags = 0; - int rdw_flags; NTSTATUS Status = STATUS_SUCCESS; - DECLARE_RETURN(DWORD); - USER_REFERENCE_ENTRY Ref, CaretRef; + PWND Window = NULL; + RECTL rcScroll, rcClip, rcUpdate; + USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserScrollWindowEx\n"); UserEnterExclusive(); @@ -591,33 +591,29 @@ if (!Window || !IntIsWindowDrawable(Window)) { Window = NULL; /* prevent deref at cleanup */ - RETURN( ERROR); + RETURN(ERROR); } UserRefObjectCo(Window, &Ref); - IntGetClientRect(Window, &rcClip); - _SEH2_TRY { if (prcUnsafeScroll) { ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); - RECTL_bIntersectRect(&rcScroll, &rcClip, prcUnsafeScroll); - } - else - rcScroll = rcClip; + rcScroll = *prcUnsafeScroll; + } if (prcUnsafeClip) { ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); - RECTL_bIntersectRect(&rcClip, &rcClip, prcUnsafeClip); + rcClip = *prcUnsafeClip; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; if (!NT_SUCCESS(Status)) { @@ -625,166 +621,13 @@ RETURN(ERROR); } - if (rcClip.right <= rcClip.left || rcClip.bottom <= rcClip.top || - (dx == 0 && dy == 0)) - { - RETURN(NULLREGION); - } - - /* We must use a copy of the region, as we can't hold an exclusive lock - * on it while doing callouts to user-mode */ - RgnUpdate = IntSysCreateRectpRgn(0, 0, 0, 0); - if(!RgnUpdate) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - RETURN(ERROR); - } - - if (hrgnUpdate) - { - RgnTemp = REGION_LockRgn(hrgnUpdate); - if (!RgnTemp) - { - EngSetLastError(ERROR_INVALID_HANDLE); - RETURN(ERROR); - } - IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); - REGION_UnlockRgn(RgnTemp); - } - - /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ - if (flags & SW_SCROLLWNDDCE) - { - dcxflags = DCX_USESTYLE; - - if (!(Window->pcls->style & (CS_OWNDC|CS_CLASSDC))) - dcxflags |= DCX_CACHE; // AH??? wine~ If not Powned or with Class go Cheap! - - if (flags & SW_SCROLLCHILDREN && Window->style & WS_CLIPCHILDREN) - dcxflags |= DCX_CACHE|DCX_NOCLIPCHILDREN; - } - else - { - /* So in this case ScrollWindowEx uses Cache DC. */ - dcxflags = DCX_CACHE|DCX_USESTYLE; - if (flags & SW_SCROLLCHILDREN) dcxflags |= DCX_NOCLIPCHILDREN; - } - - hDC = UserGetDCEx(Window, 0, dcxflags); - if (!hDC) - { - /* FIXME: SetLastError? */ - RETURN(ERROR); - } - - rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; - - rcCaret = rcScroll; - hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); - - Result = UserScrollDC( hDC, - dx, - dy, - &rcScroll, - &rcClip, - NULL, - RgnUpdate, - prcUnsafeUpdate? &rcUpdate : NULL); - - UserReleaseDC(Window, hDC, FALSE); - - /* - * Take into account the fact that some damage may have occurred during - * the scroll. Keep a copy in hrgnWinupd to be added to hrngUpdate at the end. - */ - - RgnTemp = IntSysCreateRectpRgn(0, 0, 0, 0); - if (!RgnTemp) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - RETURN(ERROR); - } - - if (co_IntGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) - { - PREGION RgnClip = IntSysCreateRectpRgnIndirect(&rcClip); - if (RgnClip) - { - if (hrgnUpdate) - { - RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); - IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); - } - - REGION_bOffsetRgn(RgnTemp, dx, dy); - - IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND); - - if (hrgnUpdate) - IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR ); - - co_UserRedrawWindow(Window, NULL, RgnTemp, rdw_flags ); - - REGION_Delete(RgnClip); - } - } - REGION_Delete(RgnTemp); - - if (flags & SW_SCROLLCHILDREN) - { - PWND Child; - RECTL rcChild; - POINT ClientOrigin; - USER_REFERENCE_ENTRY WndRef; - RECTL rcDummy; - LPARAM lParam; - - IntGetClientOrigin(Window, &ClientOrigin); - - for (Child = Window->spwndChild; Child; Child = Child->spwndNext) - { - rcChild = Child->rcWindow; - rcChild.left -= ClientOrigin.x; - rcChild.top -= ClientOrigin.y; - rcChild.right -= ClientOrigin.x; - rcChild.bottom -= ClientOrigin.y; - - if (!prcUnsafeScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) - { - UserRefObjectCo(Child, &WndRef); - - if (Window->spwndParent == UserGetDesktopWindow()) // Window->spwndParent->fnid == FNID_DESKTOP ) - lParam = MAKELONG(Child->rcClient.left, Child->rcClient.top); - else - lParam = MAKELONG(rcChild.left + dx, rcChild.top + dy); - - /* wine sends WM_POSCHANGING, WM_POSCHANGED messages */ - /* windows sometimes a WM_MOVE */ - co_IntSendMessage(UserHMGetHandle(Child), WM_MOVE, 0, lParam); - - UserDerefObjectCo(Child); - } - } - } - - if (flags & (SW_INVALIDATE | SW_ERASE)) - { - co_UserRedrawWindow( Window, - NULL, - RgnUpdate, - rdw_flags | /* HACK */ - ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : RDW_NOCHILDREN) ); - } - - if (hwndCaret && (CaretWnd = UserGetWindowObject(hwndCaret))) - { - UserRefObjectCo(CaretWnd, &CaretRef); - - co_IntSetCaretPos(rcCaret.left + dx, rcCaret.top + dy); - co_UserShowCaret(CaretWnd); - - UserDerefObjectCo(CaretWnd); - } + Result = IntScrollWindowEx(Window, + dx, dy, + prcUnsafeScroll ? &rcScroll : NULL, + prcUnsafeClip ? &rcClip : NULL, + hrgnUpdate, + prcUnsafeUpdate ? &rcUpdate : NULL, + flags); if (prcUnsafeUpdate) { @@ -798,7 +641,7 @@ { Status = _SEH2_GetExceptionCode(); } - _SEH2_END + _SEH2_END; if (!NT_SUCCESS(Status)) { @@ -810,29 +653,6 @@ RETURN(Result); CLEANUP: - if (hrgnUpdate && (_ret_ != ERROR)) - { - /* Give everything back to the caller */ - RgnTemp = REGION_LockRgn(hrgnUpdate); - /* The handle should still be valid */ - ASSERT(RgnTemp); - if (RgnWinupd) - IntGdiCombineRgn(RgnTemp, RgnUpdate, RgnWinupd, RGN_OR); - else - IntGdiCombineRgn(RgnTemp, RgnUpdate, NULL, RGN_COPY); - REGION_UnlockRgn(RgnTemp); - } - - if (RgnWinupd) - { - REGION_Delete(RgnWinupd); - } - - if (RgnUpdate) - { - REGION_Delete(RgnUpdate); - } - if (Window) UserDerefObjectCo(Window); @@ -841,5 +661,4 @@ END_CLEANUP; } - /* EOF */

8 years, 4 months

[cwittich] 72092: [BROWSEUI] pass a full pidl to ILGetDisplayNameEx CORE-11458

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Aug 2 14:52:08 2016 New Revision: 72092 URL: http://svn.reactos.org/svn/reactos?rev=72092&view=rev Log: [BROWSEUI] pass a full pidl to ILGetDisplayNameEx CORE-11458 Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Tue Aug 2 14:52:08 2016 @@ -344,7 +344,7 @@ /* Get the name of the node */ WCHAR wszDisplayName[MAX_PATH]; - if (!ILGetDisplayNameEx(psfParent, pEltRelative, wszDisplayName, ILGDN_INFOLDER)) + if (!ILGetDisplayNameEx(psfParent, pElt, wszDisplayName, ILGDN_INFOLDER)) { ERR("Failed to get node name\n"); return NULL;

8 years, 4 months

[pschweitzer] 72091: [MPR] Properly set local name in case of redirection for *A function calls. Alreaedy sent upstream. CORE-11757

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 11:46:31 2016 New Revision: 72091 URL: http://svn.reactos.org/svn/reactos?rev=72091&view=rev Log: [MPR] Properly set local name in case of redirection for *A function calls. Alreaedy sent upstream. CORE-11757 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Tue Aug 2 11:46:31 2016 @@ -1757,11 +1757,11 @@ void *accessname; DWORD *buffer_size; DWORD *result; - DWORD (*pre_set_accessname)(struct use_connection_context*, void *); - void (*set_accessname)(struct use_connection_context*, void *); + DWORD (*pre_set_accessname)(struct use_connection_context*, WCHAR *); + void (*set_accessname)(struct use_connection_context*, WCHAR *); }; -static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt, void *local_name) +static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { @@ -1784,7 +1784,7 @@ return ERROR_SUCCESS; } -static void use_connection_set_accessnameW(struct use_connection_context *ctxt, void *local_name) +static void use_connection_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { WCHAR *accessname = ctxt->accessname; if (local_name) @@ -1959,14 +1959,14 @@ return wnet_use_connection(&ctxt); } -static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt, void *local_name) +static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; if (local_name) - len = strlen(local_name); + len = WideCharToMultiByte(CP_ACP, 0, local_name, -1, NULL, 0, NULL, NULL) - 1; else len = strlen(ctxt->resourceA->lpRemoteName); @@ -1982,12 +1982,12 @@ return ERROR_SUCCESS; } -static void use_connection_set_accessnameA(struct use_connection_context *ctxt, void *local_name) +static void use_connection_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { char *accessname = ctxt->accessname; if (local_name) { - strcpy(accessname, local_name); + WideCharToMultiByte(CP_ACP, 0, local_name, -1, accessname, *ctxt->buffer_size, NULL, NULL); if (ctxt->result) *ctxt->result = CONNECT_LOCALDRIVE; }

8 years, 4 months

[pschweitzer] 72090: [MPR] Misc fixes. Already sent upstream (d'oh!) CORE-11757 ROSAPPS-303

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 10:21:24 2016 New Revision: 72090 URL: http://svn.reactos.org/svn/reactos?rev=72090&view=rev Log: [MPR] Misc fixes. Already sent upstream (d'oh!) CORE-11757 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Tue Aug 2 10:21:24 2016 @@ -62,10 +62,11 @@ WNetProvider table[1]; } WNetProviderTable, *PWNetProviderTable; -#define WNET_ENUMERATOR_TYPE_NULL 0 -#define WNET_ENUMERATOR_TYPE_GLOBAL 1 -#define WNET_ENUMERATOR_TYPE_PROVIDER 2 -#define WNET_ENUMERATOR_TYPE_CONTEXT 3 +#define WNET_ENUMERATOR_TYPE_NULL 0 +#define WNET_ENUMERATOR_TYPE_GLOBAL 1 +#define WNET_ENUMERATOR_TYPE_PROVIDER 2 +#define WNET_ENUMERATOR_TYPE_CONTEXT 3 +#define WNET_ENUMERATOR_TYPE_CONNECTED 4 /* An WNet enumerator. Note that the type doesn't correspond to the scope of * the enumeration; it represents one of the following types: @@ -1756,18 +1757,18 @@ void *accessname; DWORD *buffer_size; DWORD *result; - DWORD (*pre_set_accessname)(struct use_connection_context*); - void (*set_accessname)(struct use_connection_context*); + DWORD (*pre_set_accessname)(struct use_connection_context*, void *); + void (*set_accessname)(struct use_connection_context*, void *); }; -static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt, void *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resource->lpLocalName) - len = strlenW(ctxt->resource->lpLocalName); + if (local_name) + len = strlenW(local_name); else len = strlenW(ctxt->resource->lpRemoteName); @@ -1783,13 +1784,15 @@ return ERROR_SUCCESS; } -static void use_connection_set_accessnameW(struct use_connection_context *ctxt) +static void use_connection_set_accessnameW(struct use_connection_context *ctxt, void *local_name) { WCHAR *accessname = ctxt->accessname; - if (ctxt->resource->lpLocalName) - strcpyW(accessname, ctxt->resource->lpLocalName); + if (local_name) + { + strcpyW(accessname, local_name); if (ctxt->result) *ctxt->result = CONNECT_LOCALDRIVE; + } else strcpyW(accessname, ctxt->resource->lpRemoteName); } @@ -1799,6 +1802,7 @@ DWORD ret, prov_size = 0x1000, len; LPNETRESOURCEW provider; WCHAR * system; + WCHAR * provider_name; provider = HeapAlloc(GetProcessHeap(), 0, prov_size); if (!provider) @@ -1826,13 +1830,13 @@ } len = WideCharToMultiByte(CP_ACP, 0, provider->lpProvider, -1, NULL, 0, NULL, NULL); - ctxt->resource->lpProvider = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (ctxt->resource->lpProvider) - memcpy(ctxt->resource->lpProvider, provider->lpProvider, len * sizeof(WCHAR)); + provider_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (provider_name) + memcpy(provider_name, provider->lpProvider, len * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, provider); - return ctxt->resource->lpProvider; + return provider_name; } static DWORD wnet_use_connection( struct use_connection_context *ctxt ) @@ -1841,49 +1845,52 @@ DWORD index, ret, caps; BOOLEAN redirect = FALSE, prov = FALSE; WCHAR letter[3] = {'z', ':', 0}; + NETRESOURCEW netres; if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; if (!ctxt->resource) return ERROR_INVALID_PARAMETER; - - if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) - { - if (ctxt->resource->dwType != RESOURCETYPE_DISK && ctxt->resource->dwType != RESOURCETYPE_PRINT) + netres = *ctxt->resource; + + if (!netres.lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) + { + if (netres.dwType != RESOURCETYPE_DISK && netres.dwType != RESOURCETYPE_PRINT) { return ERROR_BAD_DEV_TYPE; } - if (ctxt->resource->dwType == RESOURCETYPE_PRINT) + if (netres.dwType == RESOURCETYPE_PRINT) { FIXME("Locale device selection is not implemented for printers.\n"); return WN_NO_NETWORK; } redirect = TRUE; - ctxt->resource->lpLocalName = letter; + netres.lpLocalName = letter; } if (ctxt->flags & CONNECT_INTERACTIVE) { - ret = ERROR_BAD_NET_NAME; - goto done; - } - - if (!ctxt->resource->lpProvider) - { - ctxt->resource->lpProvider = select_provider(ctxt); - if (!ctxt->resource->lpProvider) - { - ret = ERROR_NO_NET_OR_BAD_PATH; - goto done; + return ERROR_BAD_NET_NAME; + } + + if (ctxt->flags & CONNECT_UPDATE_PROFILE) + FIXME("Connection saving is not implemented\n"); + + if (!netres.lpProvider) + { + netres.lpProvider = select_provider(ctxt); + if (!netres.lpProvider) + { + return ERROR_NO_NET_OR_BAD_PATH; } prov = TRUE; } - index = _findProviderIndexW(ctxt->resource->lpProvider); + index = _findProviderIndexW(netres.lpProvider); if (index == BAD_PROVIDER_INDEX) { ret = ERROR_BAD_PROVIDER; @@ -1898,7 +1905,7 @@ goto done; } - if ((ret = ctxt->pre_set_accessname(ctxt))) + if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) { goto done; } @@ -1907,26 +1914,20 @@ do { if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); + ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); if (redirect) letter[0] -= 1; } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'c'); if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt); + ctxt->set_accessname(ctxt, netres.lpLocalName); done: if (prov) - { - HeapFree(GetProcessHeap(), 0, ctxt->resource->lpProvider); - ctxt->resource->lpProvider = NULL; - } - - if (redirect) - ctxt->resource->lpLocalName = NULL; + HeapFree(GetProcessHeap(), 0, netres.lpProvider); return ret; } @@ -1958,14 +1959,14 @@ return wnet_use_connection(&ctxt); } -static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt, void *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resourceA->lpLocalName) - len = strlen(ctxt->resourceA->lpLocalName); + if (local_name) + len = strlen(local_name); else len = strlen(ctxt->resourceA->lpRemoteName); @@ -1981,13 +1982,15 @@ return ERROR_SUCCESS; } -static void use_connection_set_accessnameA(struct use_connection_context *ctxt) +static void use_connection_set_accessnameA(struct use_connection_context *ctxt, void *local_name) { char *accessname = ctxt->accessname; - if (ctxt->resourceA->lpLocalName) - strcpy(accessname, ctxt->resourceA->lpLocalName); + if (local_name) + { + strcpy(accessname, local_name); if (ctxt->result) *ctxt->result = CONNECT_LOCALDRIVE; + } else strcpy(accessname, ctxt->resourceA->lpRemoteName); }

8 years, 4 months

[pschweitzer] 72089: [HACKSSIGN] Drop hackssign app. It's now obsolete. You served us well :-). ROSAPPS-303

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 10:12:37 2016 New Revision: 72089 URL: http://svn.reactos.org/svn/reactos?rev=72089&view=rev Log: [HACKSSIGN] Drop hackssign app. It's now obsolete. You served us well :-). ROSAPPS-303 Removed: trunk/rosapps/applications/cmdutils/hackssign/ Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Aug 2 10:12:37 2016 @@ -1,7 +1,6 @@ add_subdirectory(appwiz) add_subdirectory(arping) add_subdirectory(cat) -add_subdirectory(hackssign) add_subdirectory(ntfsinfo) add_subdirectory(tee) add_subdirectory(touch)

8 years, 4 months

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 August 2016