Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[pschweitzer] 66357: [KERNEL32] Remove trailing spaces. Patch by Thomas

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Feb 19 19:10:07 2015 New Revision: 66357 URL: http://svn.reactos.org/svn/reactos?rev=66357&view=rev Log: [KERNEL32] Remove trailing spaces. Patch by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Thu Feb 19 19:10:07 2015 @@ -304,7 +304,7 @@ NULL); /* Attempt to open source file */ Status = NtOpenFile(&SourceHandle, - FILE_READ_ATTRIBUTES | DELETE | SYNCHRONIZE, + FILE_READ_ATTRIBUTES | DELETE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, @@ -474,7 +474,7 @@ if (Status != STATUS_NOT_SAME_DEVICE || !(dwFlags & MOVEFILE_COPY_ALLOWED)) { /* ReactOS hack! To be removed once all FSD have proper renaming support - * Just leave status to error and leave + * Just leave status to error and leave */ if (Status == STATUS_NOT_IMPLEMENTED) {

9 years, 10 months

[pschweitzer] 66356: [KERNEL32] Fix heap buffer overflow in case PendingFileRenameOperations already exists. Spotted by Thomas

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Feb 19 19:05:56 2015 New Revision: 66356 URL: http://svn.reactos.org/svn/reactos?rev=66356&view=rev Log: [KERNEL32] Fix heap buffer overflow in case PendingFileRenameOperations already exists. Spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Thu Feb 19 19:05:56 2015 @@ -92,7 +92,7 @@ } /* Reserve enough to read previous string + to append our with required null chars */ - BufferLength = NewPath->Length + ExistingPath->Length + STRING_LENGTH + 3 * sizeof(WCHAR); + BufferLength = NewPath->Length + ExistingPath->Length + STRING_LENGTH + 3 * sizeof(UNICODE_NULL); /* Check we didn't overflow */ if (BufferLength < STRING_LENGTH) { @@ -122,7 +122,7 @@ /* If buffer was too small, then, reallocate one which is big enough */ StringLength = DataSize; RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - BufferLength = ExistingPath->Length + StringLength + NewPath->Length + 3 * sizeof(WCHAR); + BufferLength = ExistingPath->Length + StringLength + NewPath->Length + 3 * sizeof(UNICODE_NULL); if (BufferLength < StringLength) { NtClose(KeyHandle); @@ -148,9 +148,11 @@ { PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PKEY_VALUE_PARTIAL_INFORMATION)Buffer; - /* Get data, our buffer begin and then where we should append data (+ null char) */ + /* Get data, our buffer begin and then where we should append data + * (- null char, this is REG_MULTI_SZ, it already includes double termination, we keep only one) + */ BufferBegin = PartialInfo->Data; - BufferWrite = (PWSTR)((ULONG_PTR)PartialInfo->Data + PartialInfo->DataLength + sizeof(WCHAR)); + BufferWrite = (PWSTR)((ULONG_PTR)PartialInfo->Data + PartialInfo->DataLength - sizeof(UNICODE_NULL)); } /* First copy existing */

9 years, 10 months

[pschweitzer] 66355: [KERNEL32] Fixx 64bits build. Spotted by Thomas

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Feb 19 18:42:37 2015 New Revision: 66355 URL: http://svn.reactos.org/svn/reactos?rev=66355&view=rev Log: [KERNEL32] Fixx 64bits build. Spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Thu Feb 19 18:42:37 2015 @@ -370,7 +370,7 @@ { DPRINT1("Delphi Exception at address: %p\n", ExceptionRecord.ExceptionInformation[0]); DPRINT1("Exception-Object: %p\n", ExceptionRecord.ExceptionInformation[1]); - DPRINT1("Exception text: %x\n", ExceptionRecord.ExceptionInformation[2]); + DPRINT1("Exception text: %lx\n", ExceptionRecord.ExceptionInformation[2]); } /* Trace the wine special error and show the modulename and functionname */

9 years, 10 months

[pschweitzer] 66354: [KERNEL32] Don't pretend that ExceptionRecord.ExceptionInformation[2] is a pointer to a string in case of Delphi exception. This can lead to invalid pointer dereference in DbgP...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Feb 19 18:36:32 2015 New Revision: 66354 URL: http://svn.reactos.org/svn/reactos?rev=66354&view=rev Log: [KERNEL32] Don't pretend that ExceptionRecord.ExceptionInformation[2] is a pointer to a string in case of Delphi exception. This can lead to invalid pointer dereference in DbgPrint then. For instance: (../../dll/win32/kernel32/client/except.c:371) Delphi Exception at address: 50075885 (../../dll/win32/kernel32/client/except.c:372) Exception-Object: 00E885A8 (../../dll/win32/kernel32/client/except.c:373) Exception text: 2 Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Thu Feb 19 18:36:32 2015 @@ -370,7 +370,7 @@ { DPRINT1("Delphi Exception at address: %p\n", ExceptionRecord.ExceptionInformation[0]); DPRINT1("Exception-Object: %p\n", ExceptionRecord.ExceptionInformation[1]); - DPRINT1("Exception text: %s\n", ExceptionRecord.ExceptionInformation[2]); + DPRINT1("Exception text: %x\n", ExceptionRecord.ExceptionInformation[2]); } /* Trace the wine special error and show the modulename and functionname */

9 years, 10 months

[tfaber] 66353: [EXPLORER] - Fix uninitialized variable use in CTaskSwitchWnd::OnContextMenu

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 19 16:30:37 2015 New Revision: 66353 URL: http://svn.reactos.org/svn/reactos?rev=66353&view=rev Log: [EXPLORER] - Fix uninitialized variable use in CTaskSwitchWnd::OnContextMenu Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Thu Feb 19 16:30:37 2015 @@ -378,11 +378,11 @@ SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) &hIcon); if (hIcon) return hIcon; - + hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICONSM); if (hIcon) return hIcon; - + hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICON); return hIcon; @@ -1279,7 +1279,7 @@ } LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { + { return OnThemeChanged(); } @@ -1353,7 +1353,7 @@ return Ret; } - + LRESULT HandleShellHookMsg(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { BOOL Ret = FALSE; @@ -1526,7 +1526,7 @@ HMENU hmenu = GetSystemMenu(TaskItem->hWnd, FALSE); - if (hmenu) + if (hmenu) { POINT pt; int cmd; @@ -1756,11 +1756,12 @@ LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - LRESULT Ret; + LRESULT Ret = 0; + INT_PTR iBtn = -1; + if (m_TaskBar.m_hWnd != NULL) { POINT pt; - INT_PTR iBtn; pt.x = GET_X_LPARAM(lParam); pt.y = GET_Y_LPARAM(lParam); @@ -1772,13 +1773,10 @@ { HandleButtonRightClick(iBtn); } - else - goto ForwardContextMenuMsg; - } - else - { - ForwardContextMenuMsg: - /* Forward message */ + } + if (iBtn < 0) + { + /* Not on a taskbar button, so forward message to tray */ Ret = SendMessage(m_Tray->GetHWND(), uMsg, wParam, lParam); } return Ret;

9 years, 10 months

[tfaber] 66352: [PSDK] - Fix packing for system restore point API types (STATEMGRSTATUS in particular). Fixes VC++ 2012 redist installer. CORE-8010 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 19 15:42:33 2015 New Revision: 66352 URL: http://svn.reactos.org/svn/reactos?rev=66352&view=rev Log: [PSDK] - Fix packing for system restore point API types (STATEMGRSTATUS in particular). Fixes VC++ 2012 redist installer. CORE-8010 #resolve Modified: trunk/reactos/include/psdk/srrestoreptapi.h Modified: trunk/reactos/include/psdk/srrestoreptapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/srrestoreptap… ============================================================================== --- trunk/reactos/include/psdk/srrestoreptapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/srrestoreptapi.h [iso-8859-1] Thu Feb 19 15:42:33 2015 @@ -39,6 +39,8 @@ /* Types */ +#pragma pack(push, 1) + typedef struct _RESTOREPTINFOA { DWORD dwEventType; DWORD dwRestorePtType; @@ -47,10 +49,10 @@ } RESTOREPOINTINFOA, *PRESTOREPOINTINFOA; typedef struct _RESTOREPTINFOW { - DWORD dwEventType; - DWORD dwRestorePtType; - INT64 llSequenceNumber; - WCHAR szDescription[MAX_DESC_W]; + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + WCHAR szDescription[MAX_DESC_W]; } RESTOREPOINTINFOW, *PRESTOREPOINTINFOW; typedef struct _SMGRSTATUS { @@ -58,12 +60,14 @@ INT64 llSequenceNumber; } STATEMGRSTATUS, *PSTATEMGRSTATUS; +#pragma pack(pop) + /* Functions */ BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); BOOL WINAPI SRSetRestorePointW(PRESTOREPOINTINFOW, PSTATEMGRSTATUS); DWORD WINAPI SRRemoveRestorePoint(DWORD); - + #ifdef __cplusplus } #endif

9 years, 10 months

[tfaber] 66351: [KMTESTS:RTL] - Add some simple tests for RtlRaiseStatus to the RtlException test - Add missing volatile in (disabled) stack overflow test that caused an infinite loop on GCC builds...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 19 12:55:57 2015 New Revision: 66351 URL: http://svn.reactos.org/svn/reactos?rev=66351&view=rev Log: [KMTESTS:RTL] - Add some simple tests for RtlRaiseStatus to the RtlException test - Add missing volatile in (disabled) stack overflow test that caused an infinite loop on GCC builds CORE-8773 Modified: trunk/rostests/kmtests/include/kmt_platform.h trunk/rostests/kmtests/rtl/RtlException.c Modified: trunk/rostests/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_platf… ============================================================================== --- trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] Thu Feb 19 12:55:57 2015 @@ -55,6 +55,7 @@ #define ExFreePoolWithTag(p, tag) HeapFree(GetProcessHeap(), 0, p) #define RtlCopyMemoryNonTemporal RtlCopyMemory #define RtlPrefetchMemoryNonTemporal(s, l) +#define ExRaiseStatus RtlRaiseStatus #endif /* defined KMT_EMULATE_KERNEL */ #endif /* defined KMT_USER_MODE */ Modified: trunk/rostests/kmtests/rtl/RtlException.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Thu Feb 19 12:55:57 2015 @@ -5,6 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ +#define KMT_EMULATE_KERNEL #include <kmt_test.h> START_TEST(RtlException) @@ -39,13 +40,29 @@ KmtEndSeh(STATUS_ACCESS_VIOLATION); #endif + KmtStartSeh() + ExRaiseStatus(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + + KmtStartSeh() + ExRaiseStatus(STATUS_TIMEOUT); + KmtEndSeh(STATUS_TIMEOUT); + + KmtStartSeh() + ExRaiseStatus(STATUS_STACK_OVERFLOW); + KmtEndSeh(STATUS_STACK_OVERFLOW); + + KmtStartSeh() + ExRaiseStatus(STATUS_GUARD_PAGE_VIOLATION); + KmtEndSeh(STATUS_GUARD_PAGE_VIOLATION); + /* We cannot test this in kernel mode easily - the stack is just "somewhere" * in system space, and there's no guard page below it */ #if CORE_6640_IS_FIXED #ifdef KMT_USER_MODE /* Overflow the stack - must cause a special exception */ KmtStartSeh() - PCHAR Pointer; + volatile CHAR *Pointer; while (1) {

9 years, 10 months

[jimtabor] 66350: [NtUser] - Fix wine msg test_SetParent tests. See CORE-7447. Show owned pop up code was added for later testing.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 19 02:03:53 2015 New Revision: 66350 URL: http://svn.reactos.org/svn/reactos?rev=66350&view=rev Log: [NtUser] - Fix wine msg test_SetParent tests. See CORE-7447. Show owned pop up code was added for later testing. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Thu Feb 19 02:03:53 2015 @@ -207,7 +207,7 @@ USER_REFERENCE_ENTRY Ref; PTHREADINFO pti = gptiCurrent; - //ERR("AOWM 1\n"); + //ERR("AOWM 1 %p\n",Wnd->head.h); ActivePrev = (pti->MessageQueue->spwndActivePrev != NULL); FindTopWnd = TRUE; @@ -238,7 +238,7 @@ //ERR("ActivateOtherWindowMin Set FG 1\n"); co_IntSetForegroundWindow(pWndSetActive); UserDerefObjectCo(pWndSetActive); - //ERR("AOWM 2 Exit Good\n"); + //ERR("AOWM 2 Exit Good %p\n",pWndSetActive->head.h); return TRUE; } if (!pWndTemp ) pWndTemp = pWndSetActive; @@ -275,7 +275,7 @@ //ERR("ActivateOtherWindowMin Set FG 2\n"); co_IntSetForegroundWindow(pWndSetActive); UserDerefObjectCo(pWndSetActive); - //ERR("AOWM 3 Exit Good\n"); + //ERR("AOWM 3 Exit Good %p\n",pWndSetActive->head.h); return TRUE; } //ERR("AOWM 4 Bad\n"); @@ -385,6 +385,7 @@ //ERR("WinPosActivateOtherWindow Set Active 0x%p\n",WndTo); if (!co_IntSetActiveWindow(WndTo,FALSE,TRUE,FALSE)) /* Ok for WndTo to be NULL here */ { + //ERR("WPAOW SA 1\n"); co_IntSetActiveWindow(NULL,FALSE,TRUE,FALSE); } if (WndTo) UserDerefObjectCo(WndTo); @@ -700,7 +701,7 @@ pwndParent = Window->spwndParent; if (pwndParent == UserGetDesktopWindow()) { - //ERR("Parent is Desktop, Min off screen!\n"); + ERR("Parent is Desktop, Min off screen!\n"); /* ReactOS doesn't support iconic minimize to desktop */ Pos->x = Pos->y = -32000; Window->InternalPos.flags |= WPF_MININIT; @@ -775,10 +776,10 @@ { switch (ShowFlag) { + case SW_MINIMIZE: case SW_SHOWMINNOACTIVE: case SW_SHOWMINIMIZED: case SW_FORCEMINIMIZE: - case SW_MINIMIZE: return SWP_NOSIZE | SWP_NOMOVE; } if (!co_IntSendMessageNoWait(Wnd->head.h, WM_QUERYOPEN, 0, 0)) @@ -789,10 +790,10 @@ } switch (ShowFlag) { + case SW_MINIMIZE: case SW_SHOWMINNOACTIVE: case SW_SHOWMINIMIZED: case SW_FORCEMINIMIZE: - case SW_MINIMIZE: { //ERR("MinMaximize Minimize\n"); if (Wnd->style & WS_MAXIMIZE) @@ -813,7 +814,11 @@ WinPosFindIconPos(Wnd, &wpl.ptMinPosition); - if (!(old_style & WS_MINIMIZE)) SwpFlags |= SWP_STATECHANGED; + /*if (!(old_style & WS_MINIMIZE)) + { + SwpFlags |= SWP_STATECHANGED; + IntShowOwnedPopups(Wnd, FALSE); + }*/ RECTL_vSetRect(NewPos, wpl.ptMinPosition.x, wpl.ptMinPosition.y, wpl.ptMinPosition.x + UserGetSystemMetrics(SM_CXMINIMIZED), @@ -836,6 +841,10 @@ wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); */ old_style = IntSetStyle( Wnd, WS_MAXIMIZE, WS_MINIMIZE ); + /*if (old_style & WS_MINIMIZE) + { + IntShowOwnedPopups(Wnd, TRUE); + }*/ if (!(old_style & WS_MAXIMIZE)) SwpFlags |= SWP_STATECHANGED; RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, @@ -855,6 +864,8 @@ old_style = IntSetStyle( Wnd, 0, WS_MINIMIZE | WS_MAXIMIZE ); if (old_style & WS_MINIMIZE) { + //IntShowOwnedPopups(Wnd, TRUE); + if (Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED) { co_WinPosGetMinMaxInfo(Wnd, &Size, &wpl.ptMaxPosition, NULL, NULL); @@ -1286,7 +1297,7 @@ if (!(WinPos->flags & SWP_NOSENDCHANGING)) { - TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p.\n", Window->head.h); + TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p flags %04x.\n", Window->head.h,WinPos->flags); co_IntSendMessage(Window->head.h, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); } @@ -1308,6 +1319,8 @@ WindowRect->bottom = WindowRect->top + WinPos->cy; } } + + WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; if (!(WinPos->flags & SWP_NOMOVE)) { @@ -1318,7 +1331,11 @@ Parent = Window->spwndParent; - if (((Window->style & WS_CHILD) != 0) && + // Fix wine msg test_SetParent:WmSetParentSeq_2:19 wParam bits. + WinPos->flags &= ~SWP_NOCLIENTMOVE; + + // Parent child position issue is in here. SetParent_W7 test CORE-6651. + if (//((Window->style & WS_CHILD) != 0) && <- Fixes wine msg test_SetParent: "rects do not match", the last test. Parent && Parent != Window->head.rpdesk->pDeskInfo->spwnd) { @@ -1336,7 +1353,6 @@ RECTL_vOffsetRect(ClientRect, X - Window->rcWindow.left, Y - Window->rcWindow.top); } - WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x\n", WinPos->hwnd, WinPos->hwndInsertAfter, WinPos->x, WinPos->y, @@ -1545,7 +1561,9 @@ WinPos->cy = max(WinPos->cy, 0); Parent = UserGetAncestor( Wnd, GA_PARENT ); - if (!IntIsWindowVisible( Parent )) WinPos->flags |= SWP_NOREDRAW; + if (!IntIsWindowVisible( Parent ) && + /* Fix B : wine msg test_SetParent:WmSetParentSeq_2:25 wParam bits! */ + (WinPos->flags & SWP_AGG_STATUSFLAGS) == SWP_AGG_NOPOSCHANGE) WinPos->flags |= SWP_NOREDRAW; if (Wnd->style & WS_VISIBLE) WinPos->flags &= ~SWP_SHOWWINDOW; else @@ -1572,7 +1590,7 @@ WinPos->flags |= SWP_NOMOVE; } - if (WinPos->hwnd != UserGetForegroundWindow() && (Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + if ( WinPos->hwnd != UserGetForegroundWindow() && (Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD) { /* Bring to the top when activating */ if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) && @@ -1689,6 +1707,7 @@ RECTL CopyRect; PWND Ancestor; BOOL bPointerInWindow; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); ASSERT_REFS_CO(Window); @@ -2061,13 +2080,21 @@ { co_IntSendMessageNoWait(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0); } - else - { - //ERR("SetWindowPos Set FG Window!\n"); - if (Window->state & WNDS_BEINGACTIVATED) // Inside SAW? - co_IntSetActiveWindow(Window, FALSE, TRUE, FALSE); // Fixes Api AttachThreadInput tests. - else - co_IntSetForegroundWindow(Window); // Fixes SW_HIDE issues. Wine win test_SetActiveWindow & test_SetForegroundWindow. + /* Do not allow setting if already active. + Fix A : wine msg test_SetParent:WmSetParentSeq_2:25 msg! + Recursion broke the tests. + */ + else if ( pti->MessageQueue->spwndActive != Window || + pti->MessageQueue != gpqForeground ) // This fixes the breakage at boot time caused by the above line! + { + // Inside SAW? Fixes Api AttachThreadInput tests. + ERR("SetWindowPos Set FG Window! hWnd %p\n",WinPos.hwnd); + if (!(Window->state & WNDS_BEINGACTIVATED)) + { + ERR("SetWindowPos Set FG Window!\n"); + // Fixes SW_HIDE issues. Wine win test_SetActiveWindow & test_SetForegroundWindow. + co_IntSetForegroundWindow(Window); + } } } @@ -2083,7 +2110,7 @@ /* And last, send the WM_WINDOWPOSCHANGED message */ - TRACE("\tstatus flags = %04x\n", WinPos.flags & SWP_AGG_STATUSFLAGS); + TRACE("\tstatus hwnd %p flags = %04x\n",Window?Window->head.h:NULL,WinPos.flags & SWP_AGG_STATUSFLAGS); if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) { @@ -2094,7 +2121,7 @@ WinPos.y = NewWindowRect.top; WinPos.cx = NewWindowRect.right - NewWindowRect.left; WinPos.cy = NewWindowRect.bottom - NewWindowRect.top; - TRACE("WM_WINDOWPOSCHANGED hwnd %p Flags %04x\n",WinPos.hwnd,(WinPos.flags&SWP_AGG_STATUSFLAGS)); + TRACE("WM_WINDOWPOSCHANGED hwnd %p Flags %04x\n",WinPos.hwnd,WinPos.flags); co_IntSendMessageNoWait(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); } @@ -2169,6 +2196,9 @@ IntEngWindowChanged(Wnd, WOC_RGN_CLIENT); } +/* + ShowWindow does not set SWP_FRAMECHANGED!!! Fix wine msg test_SetParent:WmSetParentSeq_2:23 wParam bits! + */ BOOLEAN FASTCALL co_WinPosShowWindow(PWND Wnd, INT Cmd) { @@ -2183,8 +2213,7 @@ BOOL ShowOwned = FALSE; BOOL FirstTime = FALSE; ASSERT_REFS_CO(Wnd); - //ERR("co_WinPosShowWindow START\n"); - + //KeRosDumpStackFrames(NULL, 20); pti = PsGetCurrentThreadWin32Thread(); WasVisible = (Wnd->style & WS_VISIBLE) != 0; style = Wnd->style; @@ -2253,7 +2282,6 @@ if (!(style & WS_MINIMIZE)) { IntShowOwnedPopups(Wnd, FALSE ); - // Fix wine Win test_SetFocus todo #1 & #2, if (Cmd == SW_SHOWMINIMIZED) { @@ -2264,18 +2292,13 @@ co_UserSetFocus(0); } - Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos) | - SWP_FRAMECHANGED; + Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos); EventMsg = EVENT_SYSTEM_MINIMIZESTART; } else { - if (!WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - else //// + if (WasVisible) { //ERR("co_WinPosShowWindow Exit Good\n"); return TRUE; @@ -2292,18 +2315,13 @@ { ShowOwned = TRUE; - Swp |= co_WinPosMinMaximize(Wnd, SW_MAXIMIZE, &NewPos) | - SWP_FRAMECHANGED; + Swp |= co_WinPosMinMaximize(Wnd, SW_MAXIMIZE, &NewPos); EventMsg = EVENT_SYSTEM_MINIMIZEEND; } else { - if (!WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - else //// + if (WasVisible) { //ERR("co_WinPosShowWindow Exit Good 1\n"); return TRUE; @@ -2333,18 +2351,12 @@ if (!WasVisible) Swp |= SWP_SHOWWINDOW; if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { - Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos) | - SWP_FRAMECHANGED; - + Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos); if (style & WS_MINIMIZE) EventMsg = EVENT_SYSTEM_MINIMIZEEND; } else { - if (!WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - else //// + if (WasVisible) { //ERR("co_WinPosShowWindow Exit Good 3\n"); return TRUE; @@ -2366,9 +2378,11 @@ if ((ShowFlag != WasVisible || Cmd == SW_SHOWNA) && Cmd != SW_SHOWMAXIMIZED && !(Swp & SWP_STATECHANGED)) { - co_IntSendMessageNoWait(Wnd->head.h, WM_SHOWWINDOW, ShowFlag, 0); - if (!(Wnd->state2 & WNDS2_WIN31COMPAT)) + co_IntSendMessageNoWait(Wnd->head.h, WM_SHOWWINDOW, ShowFlag, 0); +#if 0 // Fix wine msg test_SetParent:WmSetParentSeq_1:2 + if (!(Wnd->state2 & WNDS2_WIN31COMPAT)) // <------------- XP sets this bit! co_IntSendMessageNoWait(Wnd->head.h, WM_SETVISIBLE, ShowFlag, 0); +#endif if (!VerifyWnd(Wnd)) return WasVisible; } @@ -2395,15 +2409,15 @@ if (IsChildVisible(Wnd) || Swp & SWP_STATECHANGED) { - TRACE("Child is Vis %s or State changed %s. ShowFlag %s\n", + TRACE("Child is Vis %s or State changed %s. ShowFlag %s Swp %04x\n", (IsChildVisible(Wnd) ? "TRUE" : "FALSE"), (Swp & SWP_STATECHANGED ? "TRUE" : "FALSE"), - (ShowFlag ? "TRUE" : "FALSE")); + (ShowFlag ? "TRUE" : "FALSE"),LOWORD(Swp)); co_WinPosSetWindowPos( Wnd, 0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP, NewPos.left, NewPos.top, - NewPos.right, //NewPos.right - NewPos.left, - NewPos.bottom, //NewPos.bottom - NewPos.top, + NewPos.right, // NewPos.right - NewPos.left, when minimized and restore, the window becomes smaller. + NewPos.bottom,// NewPos.bottom - NewPos.top, LOWORD(Swp)); } else @@ -2424,11 +2438,15 @@ { if ( Wnd->spwndParent == UserGetDesktopWindow()) { - if(!ActivateOtherWindowMin(Wnd)) + if (!ActivateOtherWindowMin(Wnd)) + { co_WinPosActivateOtherWindow(Wnd); + } } else + { co_WinPosActivateOtherWindow(Wnd); + } } /* Revert focus to parent */ @@ -2438,6 +2456,8 @@ if (Wnd->spwndParent == UserGetDesktopWindow()) Parent = 0; co_UserSetFocus(Parent); } + // Hide, just return. + if (Cmd == SW_HIDE) return WasVisible; } /* FIXME: Check for window destruction. */ @@ -3429,7 +3449,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; - TRACE("Enter NtUserShowWindow\n"); + TRACE("Enter NtUserShowWindow hWnd %p SW_ %d\n",hWnd, nCmdShow); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd)) || // FIXME:

9 years, 10 months

[jgardou] 66349: [CRYPT32] - Addenratum to r64026: Merge the certificate stores for real. CORE-5675 #resolve

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Feb 18 21:27:40 2015 New Revision: 66349 URL: http://svn.reactos.org/svn/reactos?rev=66349&view=rev Log: [CRYPT32] - Addenratum to r64026: Merge the certificate stores for real. CORE-5675 #resolve Modified: trunk/reactos/dll/win32/crypt32/rootstore.c Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Wed Feb 18 21:27:40 2015 @@ -808,6 +808,7 @@ HCERTSTORE collStore = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); CertAddStoreToCollection(collStore, regStore, 0, 0); + CertAddStoreToCollection(collStore, root, 0, 0); root = collStore; } }

9 years, 10 months

[pschweitzer] 66348: [ROSAUTOTESTS] Remove redundant GetTickCount() call

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Feb 18 19:52:04 2015 New Revision: 66348 URL: http://svn.reactos.org/svn/reactos?rev=66348&view=rev Log: [ROSAUTOTESTS] Remove redundant GetTickCount() call Modified: trunk/rostests/rosautotest/CWineTest.cpp Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Wed Feb 18 19:52:04 2015 @@ -254,7 +254,7 @@ { DWORD BytesAvailable; stringstream ss, ssFinish; - DWORD StartTime = GetTickCount(); + DWORD StartTime; float TotalTime; string tailString; CPipe Pipe;

9 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015