Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[tthompson] 74694: [NTFS] - Decrease debug spam

by tthompson＠svn.reactos.org

Author: tthompson Date: Sun May 28 20:51:31 2017 New Revision: 74694 URL: http://svn.reactos.org/svn/reactos?rev=74694&view=rev Log: [NTFS] - Decrease debug spam Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun May 28 20:51:31 2017 @@ -32,7 +32,6 @@ #include "ntfs.h" #define NDEBUG -#undef NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun May 28 20:51:31 2017 @@ -165,7 +165,7 @@ AllocatedBuffer = TRUE; } - DPRINT1("Effective read: %lu at %lu for stream '%S'\n", RealLength, RealReadOffset, Fcb->Stream); + DPRINT("Effective read: %lu at %lu for stream '%S'\n", RealLength, RealReadOffset, Fcb->Stream); RealLengthRead = ReadAttribute(DeviceExt, DataContext, RealReadOffset, (PCHAR)ReadBuffer, RealLength); if (RealLengthRead == 0) { @@ -184,7 +184,7 @@ *LengthRead = ToRead; - DPRINT1("%lu got read\n", *LengthRead); + DPRINT("%lu got read\n", *LengthRead); if (AllocatedBuffer) {

7 years, 6 months

[mjansen] 74693: [KERNEL32] Initial implementation for BaseCheckRunApp, calling into apphelp to check for compatibility fixes CORE-10368

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun May 28 19:27:51 2017 New Revision: 74693 URL: http://svn.reactos.org/svn/reactos?rev=74693&view=rev Log: [KERNEL32] Initial implementation for BaseCheckRunApp, calling into apphelp to check for compatibility fixes CORE-10368 Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] Sun May 28 19:27:51 2017 @@ -16,7 +16,20 @@ /* GLOBALS ********************************************************************/ ULONG g_ShimsEnabled; - +static BOOL g_ApphelpInitialized = FALSE; +static PVOID g_pApphelpCheckRunAppEx; +static PVOID g_pSdbPackAppCompatData; + +typedef BOOL (WINAPI *tApphelpCheckRunAppEx)(HANDLE FileHandle, PVOID Unk1, PVOID Unk2, PWCHAR ApplicationName, PVOID Environment, USHORT ExeType, PULONG Reason, + PVOID* SdbQueryAppCompatData, PULONG SdbQueryAppCompatDataSize, PVOID* SxsData, PULONG SxsDataSize, + PULONG FusionFlags, PULONG64 SomeFlag1, PULONG SomeFlag2); +typedef BOOL (WINAPI *tSdbPackAppCompatData)(PVOID hsdb, PVOID pQueryResult, PVOID* ppData, DWORD *dwSize); + +#define APPHELP_VALID_RESULT 0x10000 +#define APPHELP_RESULT_NOTFOUND 0x20000 +#define APPHELP_RESULT_FOUND 0x40000 + + /* FUNCTIONS ******************************************************************/ BOOLEAN @@ -136,7 +149,120 @@ DPRINT("BaseCheckAppcompatCache is UNIMPLEMENTED\n"); if (Reason) *Reason = 0; - return TRUE; + + // We don't know this app. + return FALSE; +} + +static +VOID +BaseInitApphelp(VOID) +{ + WCHAR Buffer[MAX_PATH*2]; + UNICODE_STRING DllPath = {0}; + PVOID ApphelpAddress; + PVOID pApphelpCheckRunAppEx = NULL, pSdbPackAppCompatData = NULL; + + RtlInitEmptyUnicodeString(&DllPath, Buffer, sizeof(Buffer)); + RtlCopyUnicodeString(&DllPath, &BaseWindowsDirectory); + RtlAppendUnicodeToString(&DllPath, L"\\system32\\apphelp.dll"); + + if (NT_SUCCESS(LdrLoadDll(NULL, NULL, &DllPath, &ApphelpAddress))) + { + ANSI_STRING ProcName; + + RtlInitAnsiString(&ProcName, "ApphelpCheckRunAppEx"); + if (!NT_SUCCESS(LdrGetProcedureAddress(ApphelpAddress, &ProcName, 0, &pApphelpCheckRunAppEx))) + pApphelpCheckRunAppEx = NULL; + + RtlInitAnsiString(&ProcName, "SdbPackAppCompatData"); + if (!NT_SUCCESS(LdrGetProcedureAddress(ApphelpAddress, &ProcName, 0, &pSdbPackAppCompatData))) + pSdbPackAppCompatData = NULL; + } + + if (InterlockedCompareExchangePointer(&g_pApphelpCheckRunAppEx, RtlEncodeSystemPointer(pApphelpCheckRunAppEx), NULL) == NULL) + { + g_pSdbPackAppCompatData = RtlEncodeSystemPointer(pSdbPackAppCompatData); + } +} + +/* + * + */ +BOOL +WINAPI +BaseCheckRunApp(IN HANDLE FileHandle, + IN PWCHAR ApplicationName, + IN PWCHAR Environment, + IN USHORT ExeType, + IN PULONG pReason, + IN PVOID* SdbQueryAppCompatData, + IN PULONG SdbQueryAppCompatDataSize, + IN PVOID* SxsData, + IN PULONG SxsDataSize, + OUT PULONG FusionFlags) +{ + ULONG Reason = 0; + ULONG64 Flags1 = 0; + ULONG Flags2 = 0; + BOOL Continue, NeedCleanup = FALSE; + tApphelpCheckRunAppEx pApphelpCheckRunAppEx; + tSdbPackAppCompatData pSdbPackAppCompatData; + PVOID QueryResult = NULL; + ULONG QueryResultSize = 0; + + if (!g_ApphelpInitialized) + { + BaseInitApphelp(); + g_ApphelpInitialized = TRUE; + } + + pApphelpCheckRunAppEx = RtlDecodeSystemPointer(g_pApphelpCheckRunAppEx); + pSdbPackAppCompatData = RtlDecodeSystemPointer(g_pSdbPackAppCompatData); + + if (!pApphelpCheckRunAppEx || !pSdbPackAppCompatData) + return TRUE; + + if (pReason) + Reason = *pReason; + + Continue = pApphelpCheckRunAppEx(FileHandle, NULL, NULL, ApplicationName, Environment, ExeType, &Reason, + &QueryResult, &QueryResultSize, SxsData, SxsDataSize, FusionFlags, &Flags1, &Flags2); + + if (pReason) + *pReason = Reason; + + if (Continue) + { + if ((Reason & (APPHELP_VALID_RESULT|APPHELP_RESULT_FOUND)) == (APPHELP_VALID_RESULT|APPHELP_RESULT_FOUND)) + { + if (!pSdbPackAppCompatData(NULL, QueryResult, SdbQueryAppCompatData, SdbQueryAppCompatDataSize)) + { + DPRINT1("SdbPackAppCompatData returned a failure!\n"); + NeedCleanup = TRUE; + } + } + else + { + NeedCleanup = TRUE; + } + } + + if (QueryResult) + RtlFreeHeap(RtlGetProcessHeap(), 0, QueryResult); + + if (NeedCleanup) + { + BasepFreeAppCompatData(*SdbQueryAppCompatData, *SxsData); + *SdbQueryAppCompatData = NULL; + if (SdbQueryAppCompatDataSize) + *SdbQueryAppCompatDataSize = 0; + *SxsData = NULL; + if (SxsDataSize) + *SxsDataSize = 0; + } + + return Continue; } /* @@ -171,9 +297,11 @@ Environment, &Reason)) { - /* We don't support this yet */ - UNIMPLEMENTED; - Status = STATUS_ACCESS_DENIED; + if (!BaseCheckRunApp(FileHandle, ApplicationName, Environment, ExeType, &Reason, + SdbQueryAppCompatData, SdbQueryAppCompatDataSize, SxsData, SxsDataSize, FusionFlags)) + { + Status = STATUS_ACCESS_DENIED; + } } } Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun May 28 19:27:51 2017 @@ -904,26 +904,6 @@ /* * @unimplemented */ -BOOL -WINAPI -BaseCheckRunApp(IN DWORD Unknown1, - IN DWORD Unknown2, - IN DWORD Unknown3, - IN DWORD Unknown4, - IN DWORD Unknown5, - IN DWORD Unknown6, - IN DWORD Unknown7, - IN DWORD Unknown8, - IN DWORD Unknown9, - IN DWORD Unknown10) -{ - STUB; - return FALSE; -} - -/* - * @unimplemented - */ NTSTATUS WINAPI BasepCheckWinSaferRestrictions(IN HANDLE UserToken,

7 years, 6 months

[gadamopoulos] 74692: [EXPLORER] -Implement the trick that makes the start button to get clicked when the user clicks on the corner of the screen.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun May 28 18:31:48 2017 New Revision: 74692 URL: http://svn.reactos.org/svn/reactos?rev=74692&view=rev Log: [EXPLORER] -Implement the trick that makes the start button to get clicked when the user clicks on the corner of the screen. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Sun May 28 18:31:48 2017 @@ -57,6 +57,9 @@ extern HINSTANCE hExplorerInstance; extern HANDLE hProcessHeap; extern HKEY hkExplorer; + +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) /* * explorer.c 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] Sun May 28 18:31:48 2017 @@ -20,9 +20,6 @@ #include "precomp.h" #include <commoncontrols.h> - -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) /* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every 5 seconds */ 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] Sun May 28 18:31:48 2017 @@ -20,9 +20,6 @@ #include "precomp.h" -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) - /* * SysPagerWnd */ Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sun May 28 18:31:48 2017 @@ -2446,6 +2446,63 @@ return TRUE; } + LRESULT OnNcLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + /* This handler implements the trick that makes the start button to + get pressed when the user clicked left or below the button */ + + POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; + WINDOWINFO wi = {sizeof(WINDOWINFO)}; + RECT rcStartBtn; + + bHandled = FALSE; + + m_StartButton.GetWindowRect(&rcStartBtn); + GetWindowInfo(m_hWnd, &wi); + + switch (m_Position) + { + case ABE_TOP: + case ABE_LEFT: + { + if (pt.x > rcStartBtn.right || pt.y > rcStartBtn.bottom) + return 0; + break; + } + case ABE_RIGHT: + { + if (pt.x < rcStartBtn.left || pt.y > rcStartBtn.bottom) + return 0; + + if (rcStartBtn.right + (int)wi.cxWindowBorders * 2 + 1 < wi.rcWindow.right && + pt.x > rcStartBtn.right) + { + return 0; + } + break; + } + case ABE_BOTTOM: + { + if (pt.x > rcStartBtn.right || pt.y < rcStartBtn.top) + { + return 0; + } + + if (rcStartBtn.bottom + (int)wi.cyWindowBorders * 2 + 1 < wi.rcWindow.bottom && + pt.y > rcStartBtn.bottom) + { + return 0; + } + + break; + } + } + + bHandled = TRUE; + PopupStartMenu(); + return 0; + } + LRESULT OnNcRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* We want the user to be able to get a context menu even on the nonclient @@ -2798,6 +2855,7 @@ MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChange) MESSAGE_HANDLER(WM_ENTERSIZEMOVE, OnEnterSizeMove) MESSAGE_HANDLER(WM_EXITSIZEMOVE, OnExitSizeMove) + MESSAGE_HANDLER(WM_NCLBUTTONDOWN, OnNcLButtonDown) MESSAGE_HANDLER(WM_SYSCHAR, OnSysChar) MESSAGE_HANDLER(WM_NCRBUTTONUP, OnNcRButtonUp) MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick)

7 years, 6 months

[mjansen] 74691: [USER32_APITEST] Add more tests to validate messages sent during window creation / modifying of styles. CORE-12052

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun May 28 17:40:48 2017 New Revision: 74691 URL: http://svn.reactos.org/svn/reactos?rev=74691&view=rev Log: [USER32_APITEST] Add more tests to validate messages sent during window creation / modifying of styles. CORE-12052 Modified: trunk/rostests/apitests/user32/CreateWindowEx.c Modified: trunk/rostests/apitests/user32/CreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateWin… ============================================================================== --- trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] Sun May 28 17:40:48 2017 @@ -69,13 +69,20 @@ } HWND g_TestWindow = NULL; +HWND g_ChildWindow = NULL; static int get_iwnd(HWND hWnd) { if (!g_TestWindow) g_TestWindow = hWnd; - - return hWnd == g_TestWindow ? 1 : 0; + if (!g_ChildWindow && hWnd != g_TestWindow) + g_ChildWindow = hWnd; + + if (hWnd == g_TestWindow) + return 1; + else if (hWnd == g_ChildWindow) + return 2; + return 0; } DWORD g_FaultLine = 0; @@ -83,6 +90,11 @@ DWORD g_NcExpectExStyle = 0; DWORD g_ExpectStyle = 0; DWORD g_ExpectExStyle = 0; + +DWORD g_ChildNcExpectStyle = 0; +DWORD g_ChildNcExpectExStyle = 0; +DWORD g_ChildExpectStyle = 0; +DWORD g_ChildExpectExStyle = 0; #define ok_hex_(expression, result) \ do { \ @@ -265,6 +277,8 @@ RegisterSimpleClass(MSGTestProc, L"Test_Message_Window_XX"); + g_ChangeStyle = 0; + g_ExpectStyle = g_NcExpectStyle = 0; g_ExpectExStyle = g_NcExpectExStyle = WS_EX_CLIENTEDGE; g_FaultLine = __LINE__ + 1; @@ -274,7 +288,7 @@ ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); COMPARE_CACHE(create_chain); DestroyWindow(hWnd); - g_TestWindow = NULL; + g_TestWindow = g_ChildWindow = NULL; EMPTY_CACHE(); g_ExpectStyle = g_NcExpectStyle = WS_OVERLAPPEDWINDOW; @@ -286,7 +300,7 @@ ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); COMPARE_CACHE(create_chain); DestroyWindow(hWnd); - g_TestWindow = NULL; + g_TestWindow = g_ChildWindow = NULL; EMPTY_CACHE(); g_ChangeStyle = 1; @@ -300,7 +314,7 @@ ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); COMPARE_CACHE(Below8NonServer ? create_chain_modify_below8_nonsrv : create_chain_modify); DestroyWindow(hWnd); - g_TestWindow = NULL; + g_TestWindow = g_ChildWindow = NULL; EMPTY_CACHE(); g_ExpectStyle = g_NcExpectStyle = WS_OVERLAPPEDWINDOW; @@ -312,8 +326,326 @@ ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); COMPARE_CACHE(Below8NonServer ? create_chain_modify_below8_nonsrv : create_chain_modify); DestroyWindow(hWnd); - g_TestWindow = NULL; - EMPTY_CACHE(); + g_TestWindow = g_ChildWindow = NULL; + EMPTY_CACHE(); + + UnregisterClassW(L"Test_Message_Window_XX", NULL); +} + + +static LRESULT CALLBACK MSGChildProc2(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + LRESULT lRet; + int iwnd = get_iwnd(hWnd); + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) + { + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY: + case WM_GETICON: + case WM_GETTEXT: + return DefWindowProc(hWnd, message, wParam, lParam); + break; + case WM_NCCREATE: + { + LPCREATESTRUCT create = (LPCREATESTRUCT)lParam; + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + ok_hex_(create->style, g_ChildNcExpectStyle); + ok_hex_(create->dwExStyle, g_ChildNcExpectExStyle); + + if (g_ChangeStyle) + { + DWORD dwStyle = GetWindowLong(g_TestWindow, GWL_EXSTYLE); + dwStyle &= ~(WS_EX_CLIENTEDGE); + SetWindowLong(g_TestWindow, GWL_EXSTYLE, dwStyle); + RECORD_MESSAGE(iwnd, message, MARKER, 0, 0); + SetWindowPos(g_TestWindow, NULL, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_DRAWFRAME); + + RECORD_MESSAGE(iwnd, message, MARKER, 0, 0); + ok_hex_(create->style, g_ChildNcExpectStyle); + ok_hex_(create->dwExStyle, g_ChildNcExpectExStyle); + } + } + break; + case WM_CREATE: + { + LPCREATESTRUCT create = (LPCREATESTRUCT)lParam; + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + ok_hex_(create->style, g_ChildExpectStyle); + ok_hex_(create->dwExStyle, g_ChildExpectExStyle); + } + break; + case WM_NCCALCSIZE: + case WM_STYLECHANGING: + case WM_STYLECHANGED: + case WM_SIZE: + RECORD_MESSAGE(iwnd, message, SENT, wParam, 0); + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + ok(wParam == 0,"expected wParam=0\n"); + RECORD_MESSAGE(iwnd, message, SENT, ((WINDOWPOS*)lParam)->flags, 0); + break; + default: + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + break; + } + lRet = DefWindowProc(hWnd, message, wParam, lParam); + RECORD_MESSAGE(iwnd, message, SENT_RET, 0, 0); + return lRet; +} + + +static LRESULT CALLBACK MSGTestProc2(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + LRESULT lRet; + int iwnd = get_iwnd(hWnd); + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) + { + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY: + case WM_GETICON: + case WM_GETTEXT: + return DefWindowProc(hWnd, message, wParam, lParam); + break; + case WM_NCCREATE: + { + HWND child; + LPCREATESTRUCT create = (LPCREATESTRUCT)lParam; + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + ok_hex_(create->style, g_NcExpectStyle); + ok_hex_(create->dwExStyle, g_NcExpectExStyle); + + child = CreateWindowExW(0, L"Test_Message_Window_Child2", L"", WS_CHILD, 0, 0, 10, 10, hWnd, NULL, 0, NULL); + RECORD_MESSAGE(iwnd, message, MARKER, 0, 0); + ok_(__FILE__, g_FaultLine)(g_ChildWindow == child, "Testing against the wrong child!\n"); + } + break; + case WM_NCDESTROY: + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + DestroyWindow(g_ChildWindow); + break; + case WM_CREATE: + { + LPCREATESTRUCT create = (LPCREATESTRUCT)lParam; + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + ok_hex_(create->style, g_ExpectStyle); + ok_hex_(create->dwExStyle, g_ExpectExStyle); + } + break; + case WM_NCCALCSIZE: + case WM_STYLECHANGING: + case WM_STYLECHANGED: + case WM_SIZE: + RECORD_MESSAGE(iwnd, message, SENT, wParam, 0); + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + ok(wParam == 0,"expected wParam=0\n"); + RECORD_MESSAGE(iwnd, message, SENT, ((WINDOWPOS*)lParam)->flags, 0); + break; + default: + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + break; + } + lRet = DefWindowProc(hWnd, message, wParam, lParam); + RECORD_MESSAGE(iwnd, message, SENT_RET, 0, 0); + return lRet; +} + + +MSG_ENTRY child_create_chain[] = +{ + { 1, WM_GETMINMAXINFO, SENT }, + { 1, WM_GETMINMAXINFO, SENT_RET }, + { 1, WM_NCCREATE, SENT }, + { 2, WM_NCCREATE, SENT }, + { 2, WM_NCCREATE, SENT_RET }, + { 2, WM_NCCALCSIZE, SENT }, + { 2, WM_NCCALCSIZE, SENT_RET }, + { 2, WM_CREATE, SENT }, + { 2, WM_CREATE, SENT_RET }, + { 2, WM_SIZE, SENT }, + { 2, WM_SIZE, SENT_RET }, + { 2, WM_MOVE, SENT }, + { 2, WM_MOVE, SENT_RET }, + { 1, WM_PARENTNOTIFY, SENT }, + { 1, WM_PARENTNOTIFY, SENT_RET }, + { 1, WM_NCCREATE, MARKER }, + { 1, WM_NCCREATE, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_CREATE, SENT }, + { 1, WM_CREATE, SENT_RET }, + { 0, 0 } +}; + +MSG_ENTRY child_create_chain_modify[] = +{ + { 1, WM_GETMINMAXINFO, SENT }, + { 1, WM_GETMINMAXINFO, SENT_RET }, + { 1, WM_NCCREATE, SENT }, + { 2, WM_NCCREATE, SENT }, + { 1, WM_STYLECHANGING, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGING, SENT_RET }, + { 1, WM_STYLECHANGED, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGED, SENT_RET }, + { 2, WM_NCCREATE, MARKER }, + { 1, WM_WINDOWPOSCHANGING, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_WINDOWPOSCHANGING, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT, TRUE }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_MOVE, SENT }, + { 1, WM_MOVE, SENT_RET }, + { 1, WM_SIZE, SENT }, + { 1, WM_SIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT_RET }, + { 2, WM_NCCREATE, MARKER }, + { 2, WM_NCCREATE, SENT_RET }, + { 2, WM_NCCALCSIZE, SENT }, + { 2, WM_NCCALCSIZE, SENT_RET }, + { 2, WM_CREATE, SENT }, + { 2, WM_CREATE, SENT_RET }, + { 2, WM_SIZE, SENT }, + { 2, WM_SIZE, SENT_RET }, + { 2, WM_MOVE, SENT }, + { 2, WM_MOVE, SENT_RET }, + { 1, WM_PARENTNOTIFY, SENT }, + { 1, WM_PARENTNOTIFY, SENT_RET }, + { 1, WM_NCCREATE, MARKER }, + { 1, WM_NCCREATE, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_CREATE, SENT }, + { 1, WM_CREATE, SENT_RET }, + { 0, 0 } +}; + +MSG_ENTRY child_create_chain_modify_below8_nonsrv[] = +{ + { 1, WM_GETMINMAXINFO, SENT }, + { 1, WM_GETMINMAXINFO, SENT_RET }, + { 1, WM_NCCREATE, SENT }, + { 2, WM_NCCREATE, SENT }, + { 1, WM_STYLECHANGING, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGING, SENT_RET }, + { 1, WM_STYLECHANGED, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGED, SENT_RET }, + { 2, WM_NCCREATE, MARKER }, + { 1, WM_WINDOWPOSCHANGING, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_WINDOWPOSCHANGING, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT, TRUE }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_MOVE, SENT }, + { 1, WM_MOVE, SENT_RET }, + { 1, WM_SIZE, SENT }, + { 1, WM_SIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT, TRUE }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 2, WM_NCCREATE, MARKER }, + { 2, WM_NCCREATE, SENT_RET }, + { 2, WM_NCCALCSIZE, SENT }, + { 2, WM_NCCALCSIZE, SENT_RET }, + { 2, WM_CREATE, SENT }, + { 2, WM_CREATE, SENT_RET }, + { 2, WM_SIZE, SENT }, + { 2, WM_SIZE, SENT_RET }, + { 2, WM_MOVE, SENT }, + { 2, WM_MOVE, SENT_RET }, + { 1, WM_PARENTNOTIFY, SENT }, + { 1, WM_PARENTNOTIFY, SENT_RET }, + { 1, WM_NCCREATE, MARKER }, + { 1, WM_NCCREATE, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_CREATE, SENT }, + { 1, WM_CREATE, SENT_RET }, + { 0, 0 } +}; + + + +static void Test_Messages_Child(void) +{ + HWND hWnd; + BOOL Below8NonServer = !IsWindows8OrGreater() && !IsWindowsServer(); + + RegisterSimpleClass(MSGTestProc2, L"Test_Message_Window_X2"); + RegisterSimpleClass(MSGChildProc2, L"Test_Message_Window_Child2"); + + g_ChangeStyle = 0; + + g_ExpectStyle = g_NcExpectStyle = 0; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_CLIENTEDGE; + g_ChildExpectStyle = g_ChildNcExpectStyle = WS_CHILD; + g_ChildExpectExStyle = g_ChildNcExpectExStyle = 0; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_X2", L"", 0, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(child_create_chain); + DestroyWindow(hWnd); + g_TestWindow = g_ChildWindow = NULL; + EMPTY_CACHE(); + + g_ExpectStyle = g_NcExpectStyle = WS_OVERLAPPEDWINDOW; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_OVERLAPPEDWINDOW; + g_ChildExpectStyle = g_ChildNcExpectStyle = WS_CHILD; + g_ChildExpectExStyle = g_ChildNcExpectExStyle = 0; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_X2", L"", WS_OVERLAPPEDWINDOW, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(child_create_chain); + DestroyWindow(hWnd); + g_TestWindow = g_ChildWindow = NULL; + EMPTY_CACHE(); + + g_ChangeStyle = 1; + + g_ExpectStyle = g_NcExpectStyle = 0; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_CLIENTEDGE; + g_ChildExpectStyle = g_ChildNcExpectStyle = WS_CHILD; + g_ChildExpectExStyle = g_ChildNcExpectExStyle = 0; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_X2", L"", 0, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(Below8NonServer ? child_create_chain_modify_below8_nonsrv : child_create_chain_modify); + DestroyWindow(hWnd); + g_TestWindow = g_ChildWindow = NULL; + EMPTY_CACHE(); + + g_ExpectStyle = g_NcExpectStyle = WS_OVERLAPPEDWINDOW; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_OVERLAPPEDWINDOW; + g_ChildExpectStyle = g_ChildNcExpectStyle = WS_CHILD; + g_ChildExpectExStyle = g_ChildNcExpectExStyle = 0; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_X2", L"", WS_OVERLAPPEDWINDOW, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(Below8NonServer ? child_create_chain_modify_below8_nonsrv : child_create_chain_modify); + DestroyWindow(hWnd); + g_TestWindow = g_ChildWindow = NULL; + EMPTY_CACHE(); + + UnregisterClassW(L"Test_Message_Window_X2", NULL); + UnregisterClassW(L"Test_Message_Window_Child2", NULL); } @@ -321,4 +653,5 @@ { Test_Params(); Test_Messages(); -} + Test_Messages_Child(); +}

7 years, 6 months

[bfreisen] 74690: [MSPAINT] - When setting a file as tiled wallpaper, it will now indeed show up tiled instead of centered. - All three options (tiled, centered, stretched) are working. (non-bitmap...

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sun May 28 17:33:15 2017 New Revision: 74690 URL: http://svn.reactos.org/svn/reactos?rev=74690&view=rev Log: [MSPAINT] - When setting a file as tiled wallpaper, it will now indeed show up tiled instead of centered. - All three options (tiled, centered, stretched) are working. (non-bitmaps only in Vista and above) CORE-12164 #resolve Modified: trunk/reactos/base/applications/mspaint/registry.cpp Modified: trunk/reactos/base/applications/mspaint/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] Sun May 28 17:33:15 2017 @@ -42,7 +42,7 @@ { desktop.SetStringValue(_T("Wallpaper"), szFileName); - desktop.SetStringValue(_T("WallpaperStyle"), (style == RegistrySettings::STRETCHED) ? _T("2") : _T("1")); + desktop.SetStringValue(_T("WallpaperStyle"), (style == RegistrySettings::STRETCHED) ? _T("2") : _T("0")); desktop.SetStringValue(_T("TileWallpaper"), (style == RegistrySettings::TILED) ? _T("1") : _T("0")); }

7 years, 7 months

[mjansen] 74689: [USER32_APITEST] Add tests to validate messages sent during window creation / modifying of styles. CORE-12052

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun May 28 13:55:05 2017 New Revision: 74689 URL: http://svn.reactos.org/svn/reactos?rev=74689&view=rev Log: [USER32_APITEST] Add tests to validate messages sent during window creation / modifying of styles. CORE-12052 Modified: trunk/rostests/apitests/include/msgtrace.c trunk/rostests/apitests/include/msgtrace.h trunk/rostests/apitests/user32/CreateWindowEx.c Modified: trunk/rostests/apitests/include/msgtrace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/msgtrace… ============================================================================== --- trunk/rostests/apitests/include/msgtrace.c [iso-8859-1] (original) +++ trunk/rostests/apitests/include/msgtrace.c [iso-8859-1] Sun May 28 13:55:05 2017 @@ -62,6 +62,8 @@ case WM_COMMAND: return "WM_COMMAND"; case WM_PRINTCLIENT: return "WM_PRINTCLIENT"; case WM_CTLCOLORSTATIC: return "WM_CTLCOLORSTATIC"; + case WM_STYLECHANGING: return "WM_STYLECHANGING"; + case WM_STYLECHANGED: return "WM_STYLECHANGED"; default: return NULL; } } @@ -97,12 +99,14 @@ switch (msg->type) { case POST: + case MARKER: msgName = get_msg_name(msg->msg); - msgType = "post msg"; + msgType = msg->type == POST ? "post msg" : "marker"; break; case SENT: + case SENT_RET: msgName = get_msg_name(msg->msg); - msgType = "sent msg"; + msgType = msg->type == SENT ? "sent msg" : "sent_ret msg"; break; case HOOK: msgName = get_hook_name(msg->msg); Modified: trunk/rostests/apitests/include/msgtrace.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/msgtrace… ============================================================================== --- trunk/rostests/apitests/include/msgtrace.h [iso-8859-1] (original) +++ trunk/rostests/apitests/include/msgtrace.h [iso-8859-1] Sun May 28 13:55:05 2017 @@ -6,7 +6,9 @@ SENT, POST, HOOK, - EVENT + EVENT, + SENT_RET, + MARKER } MSG_TYPE; typedef struct _MSG_ENTRY Modified: trunk/rostests/apitests/user32/CreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateWin… ============================================================================== --- trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] Sun May 28 13:55:05 2017 @@ -3,13 +3,15 @@ * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for CreateWindowEx * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + * Mark Jansen */ #include <apitest.h> #include <winuser.h> - - -START_TEST(CreateWindowEx) +#include <msgtrace.h> +#include <user32testhelpers.h> + +static void Test_Params(void) { HWND hWnd; DWORD dwError; @@ -65,3 +67,258 @@ ok(hWnd == NULL, "hWnd = %p\n", hWnd); ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError); } + +HWND g_TestWindow = NULL; + +static int get_iwnd(HWND hWnd) +{ + if (!g_TestWindow) + g_TestWindow = hWnd; + + return hWnd == g_TestWindow ? 1 : 0; +} + +DWORD g_FaultLine = 0; +DWORD g_NcExpectStyle = 0; +DWORD g_NcExpectExStyle = 0; +DWORD g_ExpectStyle = 0; +DWORD g_ExpectExStyle = 0; + +#define ok_hex_(expression, result) \ + do { \ + int _value = (expression); \ + ok_(__FILE__, g_FaultLine)(_value == (result), "Wrong value for '%s', expected: " #result " (0x%x), got: 0x%x\n", \ + #expression, (int)(result), _value); \ + } while (0) + + + +static int g_ChangeStyle = 0; +static LRESULT CALLBACK MSGTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + LRESULT lRet; + int iwnd = get_iwnd(hWnd); + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) + { + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY: + case WM_GETICON: + case WM_GETTEXT: + return DefWindowProc(hWnd, message, wParam, lParam); + break; + case WM_NCCREATE: + { + LPCREATESTRUCT create = (LPCREATESTRUCT)lParam; + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + ok_hex_(create->style, g_NcExpectStyle); + ok_hex_(create->dwExStyle, g_NcExpectExStyle); + if (g_ChangeStyle) + { + DWORD dwStyle = GetWindowLong(hWnd, GWL_EXSTYLE); + dwStyle &= ~(WS_EX_CLIENTEDGE); + SetWindowLong(hWnd, GWL_EXSTYLE, dwStyle); + RECORD_MESSAGE(iwnd, message, MARKER, 0, 0); + SetWindowPos(hWnd, NULL, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_DRAWFRAME); + + RECORD_MESSAGE(iwnd, message, MARKER, 0, 0); + ok_hex_(create->style, g_NcExpectStyle); + ok_hex_(create->dwExStyle, g_NcExpectExStyle); + } + } + break; + case WM_CREATE: + { + LPCREATESTRUCT create = (LPCREATESTRUCT)lParam; + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + ok_hex_(create->style, g_ExpectStyle); + ok_hex_(create->dwExStyle, g_ExpectExStyle); + } + break; + case WM_NCCALCSIZE: + case WM_STYLECHANGING: + case WM_STYLECHANGED: + case WM_SIZE: + RECORD_MESSAGE(iwnd, message, SENT, wParam, 0); + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + ok(wParam == 0,"expected wParam=0\n"); + RECORD_MESSAGE(iwnd, message, SENT, ((WINDOWPOS*)lParam)->flags, 0); + break; + default: + RECORD_MESSAGE(iwnd, message, SENT, 0, 0); + break; + } + lRet = DefWindowProc(hWnd, message, wParam, lParam); + RECORD_MESSAGE(iwnd, message, SENT_RET, 0, 0); + return lRet; +} + +MSG_ENTRY create_chain[] = +{ + { 1, WM_GETMINMAXINFO, SENT }, + { 1, WM_GETMINMAXINFO, SENT_RET }, + { 1, WM_NCCREATE, SENT }, + { 1, WM_NCCREATE, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_CREATE, SENT }, + { 1, WM_CREATE, SENT_RET }, + { 0, 0 } +}; + +MSG_ENTRY create_chain_modify[] = +{ + { 1, WM_GETMINMAXINFO, SENT }, + { 1, WM_GETMINMAXINFO, SENT_RET }, + { 1, WM_NCCREATE, SENT }, + { 1, WM_STYLECHANGING, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGING, SENT_RET }, + { 1, WM_STYLECHANGED, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGED, SENT_RET }, + { 1, WM_NCCREATE, MARKER }, + { 1, WM_WINDOWPOSCHANGING, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_WINDOWPOSCHANGING, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT, TRUE }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_MOVE, SENT }, + { 1, WM_MOVE, SENT_RET }, + { 1, WM_SIZE, SENT }, + { 1, WM_SIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT_RET }, + { 1, WM_NCCREATE, MARKER }, + { 1, WM_NCCREATE, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_CREATE, SENT }, + { 1, WM_CREATE, SENT_RET }, + { 0, 0 } +}; + +MSG_ENTRY create_chain_modify_below8_nonsrv[] = +{ + { 1, WM_GETMINMAXINFO, SENT }, + { 1, WM_GETMINMAXINFO, SENT_RET }, + { 1, WM_NCCREATE, SENT }, + { 1, WM_STYLECHANGING, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGING, SENT_RET }, + { 1, WM_STYLECHANGED, SENT, GWL_EXSTYLE }, + { 1, WM_STYLECHANGED, SENT_RET }, + { 1, WM_NCCREATE, MARKER }, + { 1, WM_WINDOWPOSCHANGING, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_WINDOWPOSCHANGING, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT, TRUE }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_FRAMECHANGED }, + { 1, WM_MOVE, SENT }, + { 1, WM_MOVE, SENT_RET }, + { 1, WM_SIZE, SENT }, + { 1, WM_SIZE, SENT_RET }, + { 1, WM_WINDOWPOSCHANGED, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT, TRUE }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_NCCREATE, MARKER }, + { 1, WM_NCCREATE, SENT_RET }, + { 1, WM_NCCALCSIZE, SENT }, + { 1, WM_NCCALCSIZE, SENT_RET }, + { 1, WM_CREATE, SENT }, + { 1, WM_CREATE, SENT_RET }, + { 0, 0 } +}; + + +static BOOL +IsWindowsServer() +{ + OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0, 0, VER_NT_WORKSTATION }; + DWORDLONG const dwlConditionMask = VerSetConditionMask( 0, VER_PRODUCT_TYPE, VER_EQUAL ); + + return !VerifyVersionInfoW(&osvi, VER_PRODUCT_TYPE, dwlConditionMask); +} + + +static BOOL +IsWindows8OrGreater() +{ + OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 }; + DWORDLONG const dwlConditionMask = VerSetConditionMask(VerSetConditionMask( + VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL), + VER_MINORVERSION, VER_GREATER_EQUAL), + VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL); + + osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_WIN8); + osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_WIN8); + + return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE; +} + +static void Test_Messages(void) +{ + HWND hWnd; + BOOL Below8NonServer = !IsWindows8OrGreater() && !IsWindowsServer(); + + RegisterSimpleClass(MSGTestProc, L"Test_Message_Window_XX"); + + g_ExpectStyle = g_NcExpectStyle = 0; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_CLIENTEDGE; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_XX", L"", 0, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(create_chain); + DestroyWindow(hWnd); + g_TestWindow = NULL; + EMPTY_CACHE(); + + g_ExpectStyle = g_NcExpectStyle = WS_OVERLAPPEDWINDOW; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_OVERLAPPEDWINDOW; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_XX", L"", WS_OVERLAPPEDWINDOW, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(create_chain); + DestroyWindow(hWnd); + g_TestWindow = NULL; + EMPTY_CACHE(); + + g_ChangeStyle = 1; + + g_ExpectStyle = g_NcExpectStyle = 0; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_CLIENTEDGE; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_XX", L"", 0, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(Below8NonServer ? create_chain_modify_below8_nonsrv : create_chain_modify); + DestroyWindow(hWnd); + g_TestWindow = NULL; + EMPTY_CACHE(); + + g_ExpectStyle = g_NcExpectStyle = WS_OVERLAPPEDWINDOW; + g_ExpectExStyle = g_NcExpectExStyle = WS_EX_OVERLAPPEDWINDOW; + g_FaultLine = __LINE__ + 1; + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Test_Message_Window_XX", L"", WS_OVERLAPPEDWINDOW, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + + ok(hWnd == g_TestWindow, "We are testing with %p instead of %p\n", g_TestWindow, hWnd); + COMPARE_CACHE(Below8NonServer ? create_chain_modify_below8_nonsrv : create_chain_modify); + DestroyWindow(hWnd); + g_TestWindow = NULL; + EMPTY_CACHE(); +} + + +START_TEST(CreateWindowEx) +{ + Test_Params(); + Test_Messages(); +}

7 years, 7 months

[pschweitzer] 74688: [NTOSKRNL:MM] Only warn for unimplemented in ExAllocatePoolWithTagPriority() when memory allocation fails. For the rest, the caller has the memory it asked for. Side note: we c...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 28 10:22:30 2017 New Revision: 74688 URL: http://svn.reactos.org/svn/reactos?rev=74688&view=rev Log: [NTOSKRNL:MM] Only warn for unimplemented in ExAllocatePoolWithTagPriority() when memory allocation fails. For the rest, the caller has the memory it asked for. Side note: we could also warn when caller wants to use special pool. CORE-13334 CORE-11327 Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun May 28 10:22:30 2017 @@ -2589,11 +2589,18 @@ IN ULONG Tag, IN EX_POOL_PRIORITY Priority) { + PVOID Buffer; + // // Allocate the pool // - UNIMPLEMENTED; - return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); + Buffer = ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); + if (Buffer == NULL) + { + UNIMPLEMENTED; + } + + return Buffer; } /*

7 years, 7 months

[dreimer] 74687: [RAPPS] Update 7-Zip to 16.04

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat May 27 21:08:25 2017 New Revision: 74687 URL: http://svn.reactos.org/svn/reactos?rev=74687&view=rev Log: [RAPPS] Update 7-Zip to 16.04 Modified: trunk/reactos/media/rapps/7zip.txt Modified: trunk/reactos/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/7zip.txt?rev=7… ============================================================================== --- trunk/reactos/media/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/7zip.txt [iso-8859-1] Sat May 27 21:08:25 2017 @@ -1,25 +1,25 @@ [Section] Name = 7-Zip -Version = 15.14 +Version = 16.04 License = LGPL Description = A file archiving utility with support for 7zip, zip, tar, rar and many other archive formats. -Size = 1.2 MiB +Size = 1.1 MiB Category = 12 URLSite = http://www.7-zip.org/ -URLDownload = http://www.7-zip.org/a/7z1514.msi -SHA1 = 16a24530d0db17a94383f839e2f6941125bd0c00 +URLDownload = http://www.7-zip.org/a/7z1604.exe +SHA1 = dd1cb1163c5572951c9cd27f5a8dd550b33c58a4 CDPath = none [Section.0407] Description = Dateiarchivierungswerkzeug zum Erstellen und Ãffnen von 7zip, zip, tar, rar und vielen anderen Archivformaten. -Size = 1,2 MiB +Size = 1,1 MiB [Section.0a] Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. [Section.040c] Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et d'autres archives. -Size = 1,2 Mio +Size = 1,1 Mio [Section.0410] Description = UtilitÃ per creare e aprire 7zip, zip, tar, rar e altri file archivio. @@ -32,15 +32,15 @@ [Section.0418] Description = Utilitar de arhivare a fiÈierelor, compatibil cu 7zip, zip, tar, rar Èi multe alte formate de arhive. -Size = 1,2 Mio +Size = 1,1 Mio [Section.0419] Description = Ð£ÑÐ¸Ð»Ð¸ÑÐ° Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸ Ð¾ÑÐºÑÑÑÐ¸Ñ 7zip, zip, tar, rar Ð¸ Ð´ÑÑÐ³Ð¸Ñ Ð°ÑÑÐ¸Ð²Ð½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð². -Size = 1,2 ÐÐ¸Ð +Size = 1,1 MiÐ [Section.041f] Description = 7zip, zip, tar, rar ve baÅka birÃ§ok belgelik biÃ§imi destekli bir kÃ¼tÃ¼k belgelikleme aracÄ±. -Size = 1,2 MiB +Size = 1,1 MiB [Section.0422] Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ².

7 years, 7 months

[pschweitzer] 74686: [RDBSS] Properly initialize pRdbssScavenger in RxDeviceObject to avoid NULL-ptr deref CORE-11327

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 27 20:20:27 2017 New Revision: 74686 URL: http://svn.reactos.org/svn/reactos?rev=74686&view=rev Log: [RDBSS] Properly initialize pRdbssScavenger in RxDeviceObject to avoid NULL-ptr deref 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] Sat May 27 20:20:27 2017 @@ -5513,7 +5513,8 @@ RxInitializePrefixTable(RDBSSDevice->pRxNetNameTable, 0, FALSE); RDBSSDevice->RxNetNameTableInDeviceObject.IsNetNameTable = TRUE; ScavengerTimeLimit.QuadPart = MrdrDispatch->ScavengerTimeout * 10000000LL; - RxInitializeRdbssScavenger(&RDBSSDevice->RdbssScavengerInDeviceObject, ScavengerTimeLimit); + RDBSSDevice->pRdbssScavenger = &RDBSSDevice->RdbssScavengerInDeviceObject; + RxInitializeRdbssScavenger(RDBSSDevice->pRdbssScavenger, ScavengerTimeLimit); } RDBSSDevice->pAsynchronousRequestsCompletionEvent = NULL;

7 years, 7 months

[tthompson] 74685: [NTFS] - Disable write support by default. Enable it via the registry. [BOOTDATA] - Add a commented-out section to hivesys.inf which can add the required key to enable NTFS write...

by tthompson＠svn.reactos.org

Author: tthompson Date: Sat May 27 19:32:43 2017 New Revision: 74685 URL: http://svn.reactos.org/svn/reactos?rev=74685&view=rev Log: [NTFS] - Disable write support by default. Enable it via the registry. [BOOTDATA] - Add a commented-out section to hivesys.inf which can add the required key to enable NTFS write support. Modified: branches/GSoC_2016/NTFS/boot/bootdata/hivesys.inf branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/boot/bootdata/hi… ============================================================================== --- branches/GSoC_2016/NTFS/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/boot/bootdata/hivesys.inf [iso-8859-1] Sat May 27 19:32:43 2017 @@ -1536,6 +1536,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 +; un-comment the line below to enable EXPERIMENTAL write-support on NTFS volumes: +;HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","MyDataDoesNotMatterSoEnableExperimentalWriteSupportForEveryNTFSVolume",0x00010001,0x00000001 ; Null device driver HKLM,"SYSTEM\CurrentControlSet\Services\Null","ErrorControl",0x00010001,0x00000000 Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat May 27 19:32:43 2017 @@ -486,6 +486,13 @@ LARGE_INTEGER Zero; Zero.QuadPart = 0; + if (!NtfsGlobalData->EnableWriteSupport) + { + DPRINT1("NTFS write-support is EXPERIMENTAL and is disabled by default!\n"); + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_ACCESS_DENIED; + } + // TODO: check for appropriate access ExAcquireResourceExclusiveLite(&(Fcb->MainResource), TRUE); @@ -545,7 +552,14 @@ RequestedDisposition == FILE_OPEN_IF || RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) - { + { + if (!NtfsGlobalData->EnableWriteSupport) + { + DPRINT1("NTFS write-support is EXPERIMENTAL and is disabled by default!\n"); + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_ACCESS_DENIED; + } + // Create the file record on disk Status = NtfsCreateFileRecord(DeviceExt, FileObject); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sat May 27 19:32:43 2017 @@ -82,7 +82,15 @@ break; case IRP_MJ_SET_INFORMATION: - Status = NtfsSetInformation(IrpContext); + if (!NtfsGlobalData->EnableWriteSupport) + { + DPRINT1("NTFS write-support is EXPERIMENTAL and is disabled by default!\n"); + Status = STATUS_ACCESS_DENIED; + } + else + { + Status = NtfsSetInformation(IrpContext); + } break; case IRP_MJ_DIRECTORY_CONTROL: @@ -98,7 +106,15 @@ break; case IRP_MJ_WRITE: - Status = NtfsWrite(IrpContext); + if (!NtfsGlobalData->EnableWriteSupport) + { + DPRINT1("NTFS write-support is EXPERIMENTAL and is disabled by default!\n"); + Status = STATUS_ACCESS_DENIED; + } + else + { + Status = NtfsWrite(IrpContext); + } break; case IRP_MJ_CLOSE: Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Sat May 27 19:32:43 2017 @@ -58,6 +58,8 @@ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(DEVICE_NAME); NTSTATUS Status; PDEVICE_OBJECT DeviceObject; + OBJECT_ATTRIBUTES Attributes; + HANDLE DriverKey = NULL; TRACE_(NTFS, "DriverEntry(%p, '%wZ')\n", DriverObject, RegistryPath); @@ -83,6 +85,42 @@ NtfsGlobalData->Identifier.Size = sizeof(NTFS_GLOBAL_DATA); ExInitializeResourceLite(&NtfsGlobalData->Resource); + + NtfsGlobalData->EnableWriteSupport = FALSE; + + // Read registry to determine if write support should be enabled + InitializeObjectAttributes(&Attributes, + RegistryPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwOpenKey(&DriverKey, KEY_READ, &Attributes); + if (NT_SUCCESS(Status)) + { + UNICODE_STRING ValueName; + UCHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)]; + PKEY_VALUE_PARTIAL_INFORMATION Value = (PKEY_VALUE_PARTIAL_INFORMATION)Buffer; + ULONG ValueLength = sizeof(Buffer); + ULONG ResultLength; + + RtlInitUnicodeString(&ValueName, L"MyDataDoesNotMatterSoEnableExperimentalWriteSupportForEveryNTFSVolume"); + + Status = ZwQueryValueKey(DriverKey, + &ValueName, + KeyValuePartialInformation, + Value, + ValueLength, + &ResultLength); + + if (NT_SUCCESS(Status) && Value->Data[0] == TRUE) + { + DPRINT1("\tEnabling write support on ALL NTFS volumes!\n"); + NtfsGlobalData->EnableWriteSupport = TRUE; + } + + ZwClose(DriverKey); + } /* Keep trace of Driver Object */ NtfsGlobalData->DriverObject = DriverObject; @@ -118,7 +156,7 @@ IoRegisterFileSystem(NtfsGlobalData->DeviceObject); ObReferenceObject(NtfsGlobalData->DeviceObject); - return Status; + return STATUS_SUCCESS; } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat May 27 19:32:43 2017 @@ -151,6 +151,7 @@ FAST_IO_DISPATCH FastIoDispatch; NPAGED_LOOKASIDE_LIST IrpContextLookasideList; NPAGED_LOOKASIDE_LIST FcbLookasideList; + BOOLEAN EnableWriteSupport; } NTFS_GLOBAL_DATA, *PNTFS_GLOBAL_DATA;

7 years, 7 months

← Newer
1
2
3
4
5
6
7
...
29
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 May 2017