Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[pschweitzer] 75444: [NFSD] In case NFS session expires while reading/writing to a file, renew the session instead of just failing. This avoids not being able to transfer any file with slow connect...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 30 08:46:01 2017 New Revision: 75444 URL: http://svn.reactos.org/svn/reactos?rev=75444&view=rev Log: [NFSD] In case NFS session expires while reading/writing to a file, renew the session instead of just failing. This avoids not being able to transfer any file with slow connection, and not being able to transfer big files with normal connection. CORE-8204 CORE-13484 Modified: trunk/reactos/base/services/nfsd/readwrite.c Modified: trunk/reactos/base/services/nfsd/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/nfsd/readwri… ============================================================================== --- trunk/reactos/base/services/nfsd/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/base/services/nfsd/readwrite.c [iso-8859-1] Sun Jul 30 08:46:01 2017 @@ -142,27 +142,45 @@ ULONG pnfs_bytes_read = 0; int status = NO_ERROR; - nfs41_open_stateid_arg(upcall->state_ref, &stateid); +#ifdef __REACTOS__ + do + { +#endif + nfs41_open_stateid_arg(upcall->state_ref, &stateid); #ifdef PNFS_ENABLE_READ - status = read_from_pnfs(upcall, &stateid); - - if (status == NO_ERROR || status == ERROR_HANDLE_EOF) - goto out; - - if (args->out_len) { - pnfs_bytes_read = args->out_len; - args->out_len = 0; - - args->offset += pnfs_bytes_read; - args->buffer += pnfs_bytes_read; - args->len -= pnfs_bytes_read; - } -#endif - - status = read_from_mds(upcall, &stateid); - - args->out_len += pnfs_bytes_read; + status = read_from_pnfs(upcall, &stateid); + + if (status == NO_ERROR || status == ERROR_HANDLE_EOF) + goto out; + + if (args->out_len) { + pnfs_bytes_read = args->out_len; + args->out_len = 0; + + args->offset += pnfs_bytes_read; + args->buffer += pnfs_bytes_read; + args->len -= pnfs_bytes_read; + } +#endif + + status = read_from_mds(upcall, &stateid); +#ifdef __REACTOS__ + /* Status returned by NFS server when session is to be renewed */ + if (status == 1006) + { + nfs41_session_renew(upcall->state_ref->session); + dprintf(1, "Session renewed (read)!\n"); + continue; + } +#endif + + args->out_len += pnfs_bytes_read; +#ifdef __REACTOS__ + break; + } + while (TRUE); +#endif out: return status; } @@ -278,24 +296,41 @@ uint32_t pnfs_bytes_written = 0; int status; - nfs41_open_stateid_arg(upcall->state_ref, &stateid); +#ifdef __REACTOS__ + do + { +#endif + nfs41_open_stateid_arg(upcall->state_ref, &stateid); #ifdef PNFS_ENABLE_WRITE - status = write_to_pnfs(upcall, &stateid); - if (args->out_len) { - pnfs_bytes_written = args->out_len; - args->out_len = 0; - - args->offset += pnfs_bytes_written; - args->buffer += pnfs_bytes_written; - args->len -= pnfs_bytes_written; - - if (args->len == 0) - goto out; - } -#endif - - status = write_to_mds(upcall, &stateid); + status = write_to_pnfs(upcall, &stateid); + if (args->out_len) { + pnfs_bytes_written = args->out_len; + args->out_len = 0; + + args->offset += pnfs_bytes_written; + args->buffer += pnfs_bytes_written; + args->len -= pnfs_bytes_written; + + if (args->len == 0) + goto out; + } +#endif + + status = write_to_mds(upcall, &stateid); +#ifdef __REACTOS__ + /* Status returned by NFS server when session is to be renewed */ + if (status == 1006) + { + nfs41_session_renew(upcall->state_ref->session); + dprintf(1, "Session renewed (write)!\n"); + continue; + } + + break; + } + while (TRUE); +#endif out: args->out_len += pnfs_bytes_written; return status;

7 years, 4 months

[pschweitzer] 75443: [KERNEL32] In case of synchronous read, it's legit for the FSD to notify EOF by returning success & zero read length. It fixes never ending reads when copying a file from NFS t...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 30 08:31:59 2017 New Revision: 75443 URL: http://svn.reactos.org/svn/reactos?rev=75443&view=rev Log: [KERNEL32] In case of synchronous read, it's legit for the FSD to notify EOF by returning success & zero read length. It fixes never ending reads when copying a file from NFS to local disk. CORE-8204 CORE-11327 CORE-13484 Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Sun Jul 30 08:31:59 2017 @@ -101,6 +101,13 @@ RegionSize, NULL, NULL); + /* With sync read, 0 length + status success mean EOF: + * https://msdn.microsoft.com/en-us/library/windows/desktop/aa365467(v=vs.85).… + */ + if (NT_SUCCESS(errCode) && IoStatusBlock.Information == 0) + { + errCode = STATUS_END_OF_FILE; + } if (NT_SUCCESS(errCode) && (NULL == pbCancel || ! *pbCancel)) { errCode = NtWriteFile(FileHandleDest,

7 years, 4 months

[pschweitzer] 75442: [RXCE] Don't forget to set RX_CONTEXT_FLAG_FROM_POOL flag when allocating a new RX_CONTEXT structure from pool. This avoids leaking it afterwards and exhausting NP pool when us...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 30 08:22:34 2017 New Revision: 75442 URL: http://svn.reactos.org/svn/reactos?rev=75442&view=rev Log: [RXCE] Don't forget to set RX_CONTEXT_FLAG_FROM_POOL flag when allocating a new RX_CONTEXT structure from pool. This avoids leaking it afterwards and exhausting NP pool when using NFS. CORE-8204 CORE-11327 CORE-13484 CORE-13604 Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sun Jul 30 08:22:34 2017 @@ -1752,8 +1752,12 @@ return NULL; } + /* Zero it */ + RtlZeroMemory(Context, sizeof(RX_CONTEXT)); + + /* It was allocated on NP pool, keep track of it! */ + SetFlag(Context->Flags, RX_CONTEXT_FLAG_FROM_POOL); /* And initialize it */ - RtlZeroMemory(Context, sizeof(RX_CONTEXT)); RxInitializeContext(Irp, RxDeviceObject, InitialContextFlags, Context); ASSERT((Context->MajorFunction != IRP_MJ_CREATE) || !BooleanFlagOn(Context->Flags, RX_CONTEXT_FLAG_MUST_SUCCEED_ALLOCATED));

7 years, 4 months

[pschweitzer] 75441: [RXCE] - Implement RxAcquireFcbForLazyWrite(), RxAcquireFcbForReadAhead(), RxReleaseFcbFromLazyWrite(), RxReleaseFcbFromReadAhead() This makes RXCE better at dealing with Cc (a...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 30 07:58:25 2017 New Revision: 75441 URL: http://svn.reactos.org/svn/reactos?rev=75441&view=rev Log: [RXCE] - Implement RxAcquireFcbForLazyWrite(), RxAcquireFcbForReadAhead(), RxReleaseFcbFromLazyWrite(), RxReleaseFcbFromReadAhead() This makes RXCE better at dealing with Cc (and the other way round ;-)). This notably avoids infinite acquire loops from Cc when writing on a NFS share. CORE-8204 CORE-11327 Modified: trunk/reactos/sdk/include/ddk/nodetype.h trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/include/ddk/nodetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/nodetype.h… ============================================================================== --- trunk/reactos/sdk/include/ddk/nodetype.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/nodetype.h [iso-8859-1] Sun Jul 30 07:58:25 2017 @@ -63,6 +63,8 @@ #define RDBSS_NTC_NONPAGED_FCB ((NODE_TYPE_CODE)0xebfd) #define RDBSS_NTC_MINIRDR_DISPATCH ((NODE_TYPE_CODE)0xebff) +#define RDBSS_NTC_FCB RDBSS_NTC_STORAGE_TYPE_FILE + #define NodeTypeIsFcb(FCB) ((((NodeType(FCB) & 0xff00) == RDBSS_NTC_STORAGE_TYPE_UNKNOWN)) || ((NodeType(FCB) & 0xfff0) == 0xeb90)) #define RX_SCAVENGER_MASK (0x1000) 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 07:58:25 2017 @@ -743,53 +743,6 @@ } } -NTSTATUS -NTAPI -RxAcquireExclusiveFcbResourceInMRx( - _Inout_ PMRX_FCB Fcb) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -BOOLEAN -NTAPI -RxAcquireFcbForLazyWrite( - PVOID Context, - BOOLEAN Wait) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOLEAN -NTAPI -RxAcquireFcbForReadAhead( - PVOID Context, - BOOLEAN Wait) -{ - UNIMPLEMENTED; - return FALSE; -} - -VOID -NTAPI -RxAcquireFileForNtCreateSection( - PFILE_OBJECT FileObject) -{ - UNIMPLEMENTED; -} - -NTSTATUS -NTAPI -RxAcquireForCcFlush( - PFILE_OBJECT FileObject, - PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* * @implemented */ @@ -8162,40 +8115,6 @@ return STATUS_SUCCESS; } -VOID -NTAPI -RxReleaseFcbFromLazyWrite( - PVOID Context) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI -RxReleaseFcbFromReadAhead( - PVOID Context) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI -RxReleaseFileForNtCreateSection( - PFILE_OBJECT FileObject) -{ - UNIMPLEMENTED; -} - -NTSTATUS -NTAPI -RxReleaseForCcFlush( - PFILE_OBJECT FileObject, - PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* * @implemented */ Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sun Jul 30 07:58:25 2017 @@ -174,6 +174,118 @@ /* FUNCTIONS ****************************************************************/ +NTSTATUS +NTAPI +RxAcquireExclusiveFcbResourceInMRx( + _Inout_ PMRX_FCB Fcb) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RxAcquireFcbForLazyWrite( + PVOID Context, + BOOLEAN Wait) +{ + PFCB Fcb; + BOOLEAN Ret; + + PAGED_CODE(); + + Fcb = Context; + /* The received context is a FCB */ + ASSERT(NodeType(Fcb) == RDBSS_NTC_FCB); + ASSERT_CORRECT_FCB_STRUCTURE(Fcb); + ASSERT(Fcb->Specific.Fcb.LazyWriteThread == NULL); + + /* Acquire the paging resource (shared) */ + Ret = ExAcquireResourceSharedLite(Fcb->Header.PagingIoResource, Wait); + if (Ret) + { + /* Update tracker information */ + Fcb->PagingIoResourceFile = __FILE__; + Fcb->PagingIoResourceLine = __LINE__; + /* Lazy writer thread is the current one */ + Fcb->Specific.Fcb.LazyWriteThread = PsGetCurrentThread(); + + /* There is no top level IRP */ + ASSERT(RxIsThisTheTopLevelIrp(NULL)); + /* Now, there will be! */ + Ret = RxTryToBecomeTheTopLevelIrp(NULL, (PIRP)FSRTL_CACHE_TOP_LEVEL_IRP, + Fcb->RxDeviceObject, TRUE); + /* In case of failure, release the lock and reset everything */ + if (!Ret) + { + Fcb->PagingIoResourceFile = NULL; + Fcb->PagingIoResourceLine = 0; + ExReleaseResourceLite(Fcb->Header.PagingIoResource); + Fcb->Specific.Fcb.LazyWriteThread = NULL; + } + } + + return Ret; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RxAcquireFcbForReadAhead( + PVOID Context, + BOOLEAN Wait) +{ + PFCB Fcb; + BOOLEAN Ret; + + PAGED_CODE(); + + Fcb = Context; + /* The received context is a FCB */ + ASSERT(NodeType(Fcb) == RDBSS_NTC_FCB); + ASSERT_CORRECT_FCB_STRUCTURE(Fcb); + + Ret = ExAcquireResourceSharedLite(Fcb->Header.Resource, Wait); + if (Ret) + { + /* There is no top level IRP */ + ASSERT(RxIsThisTheTopLevelIrp(NULL)); + /* Now, there will be! */ + Ret = RxTryToBecomeTheTopLevelIrp(NULL, (PIRP)FSRTL_CACHE_TOP_LEVEL_IRP, + Fcb->RxDeviceObject, TRUE); + /* In case of failure, release the lock and reset everything */ + if (!Ret) + { + ExReleaseResourceLite(Fcb->Header.Resource); + } + } + + return Ret; +} + +VOID +NTAPI +RxAcquireFileForNtCreateSection( + PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; +} + +NTSTATUS +NTAPI +RxAcquireForCcFlush( + PFILE_OBJECT FileObject, + PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* * @implemented */ @@ -7323,6 +7435,80 @@ * @implemented */ VOID +NTAPI +RxReleaseFcbFromLazyWrite( + PVOID Context) +{ + PFCB Fcb; + + PAGED_CODE(); + + Fcb = Context; + /* The received context is a FCB */ + ASSERT(NodeType(Fcb) == RDBSS_NTC_FCB); + ASSERT_CORRECT_FCB_STRUCTURE(Fcb); + + /* Lazy writer is releasing lock, so forget about it */ + Fcb->Specific.Fcb.LazyWriteThread = NULL; + + /* If we were top level IRP, unwind */ + if (RxGetTopIrpIfRdbssIrp() == (PIRP)FSRTL_CACHE_TOP_LEVEL_IRP) + { + RxUnwindTopLevelIrp(NULL); + } + + /* And finally, release the lock */ + Fcb->PagingIoResourceFile = NULL; + Fcb->PagingIoResourceLine = 0; + ExReleaseResourceLite(Fcb->Header.PagingIoResource); +} + +/* + * @implemented + */ +VOID +NTAPI +RxReleaseFcbFromReadAhead( + PVOID Context) +{ + PFCB Fcb; + + PAGED_CODE(); + + Fcb = Context; + /* The received context is a FCB */ + ASSERT(NodeType(Fcb) == RDBSS_NTC_FCB); + ASSERT_CORRECT_FCB_STRUCTURE(Fcb); + + /* Top Level IRP is CC */ + ASSERT(RxGetTopIrpIfRdbssIrp() == (PIRP)FSRTL_CACHE_TOP_LEVEL_IRP); + RxUnwindTopLevelIrp(NULL); + + ExReleaseResourceLite(Fcb->Header.Resource); +} + +VOID +NTAPI +RxReleaseFileForNtCreateSection( + PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; +} + +NTSTATUS +NTAPI +RxReleaseForCcFlush( + PFILE_OBJECT FileObject, + PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +VOID RxRemoveNameNetFcb( OUT PFCB ThisFcb) {

7 years, 4 months

[gadamopoulos] 75440: [EXPLORER] -Fix calculatting the size of the tray icons for ral this time. When positioning the windows in the tray take into account the theme content margins.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 29 13:57:29 2017 New Revision: 75440 URL: http://svn.reactos.org/svn/reactos?rev=75440&view=rev Log: [EXPLORER] -Fix calculatting the size of the tray icons for ral this time. When positioning the windows in the tray take into account the theme content margins. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Sat Jul 29 13:57:29 2017 @@ -565,12 +565,12 @@ if (IsHorizontal) { rows = max(size->cy / cyButton, 1); - columns = max((VisibleButtonCount + rows) / rows, 1); + columns = (VisibleButtonCount + rows - 1) / rows; } else { columns = max(size->cx / cxButton, 1); - rows = max((VisibleButtonCount + columns) / columns, 1); + rows = (VisibleButtonCount + columns - 1) / columns; } size->cx = columns * cxButton; size->cy = rows * cyButton; @@ -1361,10 +1361,10 @@ { SetWindowExStyle(m_hWnd, WS_EX_STATICEDGE, WS_EX_STATICEDGE); - ContentMargin.cxLeftWidth = 0; - ContentMargin.cxRightWidth = 0; - ContentMargin.cyTopHeight = 0; - ContentMargin.cyBottomHeight = 0; + ContentMargin.cxLeftWidth = 2; + ContentMargin.cxRightWidth = 2; + ContentMargin.cyTopHeight = 2; + ContentMargin.cyBottomHeight = 2; } return TRUE; @@ -1461,16 +1461,16 @@ if (IsHorizontal) { - ptClock.x = pszClient->cx - TRAY_NOTIFY_WND_SPACING_X - szTrayClockMin.cx; - ptClock.y = TRAY_NOTIFY_WND_SPACING_Y; + ptClock.x = pszClient->cx - szTrayClockMin.cx - ContentMargin.cxRightWidth; + ptClock.y = ContentMargin.cyTopHeight; szClock.cx = szTrayClockMin.cx; - szClock.cy = pszClient->cy - (2 * TRAY_NOTIFY_WND_SPACING_Y); + szClock.cy = pszClient->cy - ContentMargin.cyTopHeight - ContentMargin.cyBottomHeight; } else { - ptClock.x = TRAY_NOTIFY_WND_SPACING_X; - ptClock.y = pszClient->cy - TRAY_NOTIFY_WND_SPACING_Y - szTrayClockMin.cy; - szClock.cx = pszClient->cx - (2 * TRAY_NOTIFY_WND_SPACING_X); + ptClock.x = ContentMargin.cxLeftWidth; + ptClock.y = pszClient->cy - szTrayClockMin.cy; + szClock.cx = pszClient->cx - ContentMargin.cxLeftWidth - ContentMargin.cxRightWidth; szClock.cy = szTrayClockMin.cy; } @@ -1486,13 +1486,13 @@ if (IsHorizontal) { - ptPager.x = ptClock.x - szTrayNotify.cx; + ptPager.x = ContentMargin.cxLeftWidth; ptPager.y = (pszClient->cy - szTrayNotify.cy)/2; } else { ptPager.x = (pszClient->cx - szTrayNotify.cx)/2; - ptPager.y = ptClock.y - szTrayNotify.cy; + ptPager.y = ContentMargin.cyTopHeight; } m_pager->SetWindowPos(

7 years, 4 months

[gadamopoulos] 75439: [UXTHEME] -Fix for the 3rd or 4th time the bug where the caption window overflows over the caption buttons which was last broken by me in 74960. CORE-13435

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 29 09:43:48 2017 New Revision: 75439 URL: http://svn.reactos.org/svn/reactos?rev=75439&view=rev Log: [UXTHEME] -Fix for the 3rd or 4th time the bug where the caption window overflows over the caption buttons which was last broken by me in 74960. CORE-13435 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat Jul 29 09:43:48 2017 @@ -305,6 +305,7 @@ static void ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, + RECT* prcCurrent, CAPTIONBUTTON buttonId, INT iStateId) { @@ -347,6 +348,9 @@ //FIXME: Implement Help Button return; } + + if (prcCurrent) + prcCurrent->right = pwndData->rcCaptionButtons[buttonId].left; DrawThemeBackground(pcontext->theme, pcontext->hDC, iPartId, iStateId, &pwndData->rcCaptionButtons[buttonId], NULL); } @@ -369,13 +373,13 @@ ThemeDrawCaptionButtons(PDRAW_CONTEXT pcontext, DWORD htHot, DWORD htDown) { /* Draw the buttons */ - ThemeDrawCaptionButton(pcontext, CLOSEBUTTON, + ThemeDrawCaptionButton(pcontext, NULL, CLOSEBUTTON, ThemeGetButtonState(HTCLOSE, htHot, htDown, pcontext->Active)); - ThemeDrawCaptionButton(pcontext, MAXBUTTON, + ThemeDrawCaptionButton(pcontext, NULL, MAXBUTTON, ThemeGetButtonState(HTMAXBUTTON, htHot, htDown, pcontext->Active)); - ThemeDrawCaptionButton(pcontext, MINBUTTON, + ThemeDrawCaptionButton(pcontext, NULL, MINBUTTON, ThemeGetButtonState(HTMINBUTTON, htHot, htDown, pcontext->Active)); - ThemeDrawCaptionButton(pcontext, HELPBUTTON, + ThemeDrawCaptionButton(pcontext, NULL, HELPBUTTON, ThemeGetButtonState(HTHELP, htHot, htDown, pcontext->Active)); } @@ -421,10 +425,10 @@ { iState = pcontext->Active ? BUTTON_NORMAL : BUTTON_INACTIVE; - ThemeDrawCaptionButton(pcontext, CLOSEBUTTON, iState); - ThemeDrawCaptionButton(pcontext, MAXBUTTON, iState); - ThemeDrawCaptionButton(pcontext, MINBUTTON, iState); - ThemeDrawCaptionButton(pcontext, HELPBUTTON, iState); + ThemeDrawCaptionButton(pcontext, &rcPart, CLOSEBUTTON, iState); + ThemeDrawCaptionButton(pcontext, &rcPart, MAXBUTTON, iState); + ThemeDrawCaptionButton(pcontext, &rcPart, MINBUTTON, iState); + ThemeDrawCaptionButton(pcontext, &rcPart, HELPBUTTON, iState); } rcPart.top += 3 ;

7 years, 4 months

[gadamopoulos] 75438: [UXHTEME] - ThemeDrawCaptionText: Get the TMT_CONTENTALIGNMENT theme property and position the text accordingly. Patch by Stas'M. CORE-13600

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 29 09:25:15 2017 New Revision: 75438 URL: http://svn.reactos.org/svn/reactos?rev=75438&view=rev Log: [UXHTEME] - ThemeDrawCaptionText: Get the TMT_CONTENTALIGNMENT theme property and position the text accordingly. Patch by Stas'M. CORE-13600 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat Jul 29 09:25:15 2017 @@ -108,6 +108,8 @@ LOGFONTW logfont; COLORREF textColor; COLORREF oldTextColor; + int align = CA_LEFT; + int drawStyles = DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS; WCHAR buffer[50]; WCHAR *pszText = buffer; @@ -140,6 +142,12 @@ else textColor = GetSysColor(COLOR_CAPTIONTEXT); + GetThemeEnumValue(pcontext->theme, iPartId, iStateId, TMT_CONTENTALIGNMENT, &align); + if (align == CA_CENTER) + drawStyles |= DT_CENTER; + else if (align == CA_RIGHT) + drawStyles |= DT_RIGHT; + oldTextColor = SetTextColor(pcontext->hDC, textColor); DrawThemeText(pcontext->theme, pcontext->hDC, @@ -147,7 +155,7 @@ iStateId, pszText, len - 1, - DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS, + drawStyles, 0, pRect); SetTextColor(pcontext->hDC, oldTextColor);

7 years, 4 months

[gadamopoulos] 75437: [COMCTL32] -Take into account the upper theme margin when drawing the icon so that it doesn't look misplaced. This makes the themed taskbar buttons look more or less good desp...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 29 08:52:04 2017 New Revision: 75437 URL: http://svn.reactos.org/svn/reactos?rev=75437&view=rev Log: [COMCTL32] -Take into account the upper theme margin when drawing the icon so that it doesn't look misplaced. This makes the themed taskbar buttons look more or less good despite the fact that we completely ignore the left and right margins. Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Jul 29 08:52:04 2017 @@ -1019,6 +1019,9 @@ rcBitmap.left += ((rc.right - rc.left) - infoPtr->nBitmapWidth) / 2; rcBitmap.top += infoPtr->szPadding.cy / 2; +#ifdef __REACTOS__ + rcBitmap.top += infoPtr->themeMargins.cyTopHeight; +#endif TRACE("iBitmap=%d, start=(%d,%d) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,

7 years, 4 months

[jimtabor] 75436: [User32] - Patch by MudHead : Combobox sends a message to the deselect the text when focus is lost. CORE-10266 #resolve

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jul 29 01:59:07 2017 New Revision: 75436 URL: http://svn.reactos.org/svn/reactos?rev=75436&view=rev Log: [User32] - Patch by MudHead : Combobox sends a message to the deselect the text when focus is lost. CORE-10266 #resolve Modified: trunk/reactos/sdk/include/reactos/undocuser.h trunk/reactos/win32ss/user/user32/controls/combo.c trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/sdk/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/undocu… ============================================================================== --- trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] Sat Jul 29 01:59:07 2017 @@ -46,6 +46,7 @@ #define WM_NCUAHDRAWFRAME 0x000000AF #define WM_SYSTIMER 0x00000118 #define WM_LBTRACKPOINT 0x00000131 +#define WM_CBLOSTTEXTFOCUS 0x00000167 #define LB_CARETON 0x000001a3 #define LB_CARETOFF 0x000001a4 #define MN_SETHMENU 0x000001e0 Modified: trunk/reactos/win32ss/user/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] Sat Jul 29 01:59:07 2017 @@ -2260,6 +2260,19 @@ NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); } break; + + case WM_CBLOSTTEXTFOCUS: /* undocumented message - deselects the text when focus is lost */ + { + if (lphc->hWndEdit != NULL) + { + SendMessage(lphc->self, WM_LBUTTONUP, 0, 0xFFFFFFFF); + SendMessage(lphc->hWndEdit, EM_SETSEL, 0, 0); + lphc->wState &= ~CBF_FOCUSED; + CB_NOTIFY(lphc, CBN_KILLFOCUS); + } + } + return TRUE; + #endif default: Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Sat Jul 29 01:59:07 2017 @@ -3628,6 +3628,28 @@ */ static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) { +#ifdef __REACTOS__ + HWND hCombo; + LONG lStyles; + + es->flags &= ~EF_FOCUSED; + DestroyCaret(); + if(!(es->style & ES_NOHIDESEL)) + EDIT_InvalidateText(es, es->selection_start, es->selection_end); + + /* throw away left over scroll when we lose focus */ + es->wheelDeltaRemainder = 0; + + if (es->hwndListBox == NULL) + EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); + else + { /* send the undocumented WM_CBLOSTTEXTFOCUS message to combobox */ + hCombo = GetParent(es->hwndSelf); + lStyles = GetWindowLong(hCombo, GWL_STYLE); + if ((lStyles & CBS_DROPDOWN) || (lStyles & CBS_SIMPLE)) + SendMessage(hCombo, WM_CBLOSTTEXTFOCUS, 0, 0); + } +#else es->flags &= ~EF_FOCUSED; DestroyCaret(); if(!(es->style & ES_NOHIDESEL)) @@ -3635,6 +3657,7 @@ EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); /* throw away left over scroll when we lose focus */ es->wheelDeltaRemainder = 0; +#endif return 0; }

7 years, 4 months

[ashaposhnikov] 75435: [RAPPS] Incorrect "C" symbol replaced in the rest of the files

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Fri Jul 28 22:43:58 2017 New Revision: 75435 URL: http://svn.reactos.org/svn/reactos?rev=75435&view=rev Log: [RAPPS] Incorrect "C" symbol replaced in the rest of the files Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Fri Jul 28 22:43:58 2017 @@ -1264,10 +1264,10 @@ case ID_INSTALL: if (nSelectedApps) { - Ð¡DownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); + CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); UpdateApplicationsList(-1); } - else if(Ð¡DownloadManager::DownloadApplication(m_ListView->GetSelectedData())) + else if(CDownloadManager::DownloadApplication(m_ListView->GetSelectedData())) { UpdateApplicationsList(-1); } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Fri Jul 28 22:43:58 2017 @@ -341,15 +341,15 @@ } } -// ÑDownloadManager -PAPPLICATION_INFO ÑDownloadManager::AppInfo; -ATL::CSimpleArray<PAPPLICATION_INFO> ÑDownloadManager::AppsToInstallList; -CDowloadingAppsListView ÑDownloadManager::DownloadsListView; -INT ÑDownloadManager::iCurrentApp; +// CDownloadManager +PAPPLICATION_INFO CDownloadManager::AppInfo; +ATL::CSimpleArray<PAPPLICATION_INFO> CDownloadManager::AppsToInstallList; +CDowloadingAppsListView CDownloadManager::DownloadsListView; +INT CDownloadManager::iCurrentApp; #define DL_START_NEW WM_APP + 1 -INT_PTR CALLBACK ÑDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { HANDLE Thread; DWORD ThreadId; @@ -458,7 +458,7 @@ } } -LRESULT CALLBACK ÑDownloadManager::DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) +LRESULT CALLBACK CDownloadManager::DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) { static ATL::CStringW szProgressText; @@ -533,7 +533,7 @@ } } -DWORD WINAPI ÑDownloadManager::ThreadFunc(LPVOID Context) +DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID Context) { CComPtr<IBindStatusCallback> dl; ATL::CStringW Path; @@ -788,7 +788,7 @@ return 0; } -BOOL ÑDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList) +BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList) { if (AppsList.GetSize() == 0) { @@ -804,7 +804,7 @@ return TRUE; } -BOOL ÑDownloadManager::DownloadApplication(PAPPLICATION_INFO pAppInfo) +BOOL CDownloadManager::DownloadApplication(PAPPLICATION_INFO pAppInfo) { if (!pAppInfo) { @@ -818,7 +818,7 @@ return TRUE; } -VOID ÑDownloadManager::DownloadApplicationsDB(LPCWSTR lpUrl) +VOID CDownloadManager::DownloadApplicationsDB(LPCWSTR lpUrl) { APPLICATION_INFO IntInfo; IntInfo.szUrlDownload = lpUrl; @@ -827,7 +827,7 @@ } //TODO: Reuse the dialog -VOID ÑDownloadManager::LaunchDownloadDialog() +VOID CDownloadManager::LaunchDownloadDialog() { CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG), Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Fri Jul 28 22:43:58 2017 @@ -251,7 +251,7 @@ /* loaddlg.cpp */ class CDowloadingAppsListView; -class ÑDownloadManager +class CDownloadManager { static PAPPLICATION_INFO AppInfo; static ATL::CSimpleArray<PAPPLICATION_INFO> AppsToInstallList;

7 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 July 2017