Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[gadamopoulos] 74127: [UXTHEME] -Fix most new tests for DrawThemeParentBackground. Hackfix CloseThemeData.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 8 15:08:56 2017 New Revision: 74127 URL: http://svn.reactos.org/svn/reactos?rev=74127&view=rev Log: [UXTHEME] -Fix most new tests for DrawThemeParentBackground. Hackfix CloseThemeData. Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed Mar 8 15:08:56 2017 @@ -78,9 +78,17 @@ int hasClip = -1; TRACE("(%p,%p,%p)\n", hwnd, hdc, prc); + + if (!IsWindow(hwnd) || !hdc) + return E_HANDLE; + + if (prc && IsBadReadPtr (prc, sizeof(RECT))) + return E_POINTER; + hParent = GetParent(hwnd); if(!hParent) - hParent = hwnd; + return S_OK; + if(prc) { rt = *prc; MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2); Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Wed Mar 8 15:08:56 2017 @@ -897,6 +897,8 @@ TRACE("(%p)\n", hTheme); if(!hTheme || hTheme == INVALID_HANDLE_VALUE) return E_HANDLE; + if(IsBadReadPtr (hTheme, sizeof(THEME_CLASS))) /* This check is a hack! */ + return E_HANDLE; return MSSTYLES_CloseThemeClass(hTheme); }

7 years, 9 months

[gadamopoulos] 74126: [UXTHEME_APITEST] -Add one more test for DrawThemeParentBackground.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 8 14:54:02 2017 New Revision: 74126 URL: http://svn.reactos.org/svn/reactos?rev=74126&view=rev Log: [UXTHEME_APITEST] -Add one more test for DrawThemeParentBackground. Modified: trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c Modified: trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/DrawThem… ============================================================================== --- trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c [iso-8859-1] (original) +++ trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c [iso-8859-1] Wed Mar 8 14:54:02 2017 @@ -173,6 +173,9 @@ hr = DrawThemeParentBackground(hWnd1, hdc, NULL); ok (hr == S_OK, "Expected success got 0x%lx error\n", hr); + hr = DrawThemeParentBackground(hWnd1, (HDC)0xdeaddead, NULL); + ok (hr == S_OK, "Expected success got 0x%lx error\n", hr); + pVEH = AddVectoredExceptionHandler(1, VEHandler_2); hr = DrawThemeParentBackground(hWnd1, hdc, (RECT*)0xdeaddead); ok (hr == E_POINTER, "Expected success got 0x%lx error\n", hr);

7 years, 9 months

[gadamopoulos] 74125: [UXTHEME_APITEST] -Add more tests for DrawThemeParentBackground.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 8 14:46:36 2017 New Revision: 74125 URL: http://svn.reactos.org/svn/reactos?rev=74125&view=rev Log: [UXTHEME_APITEST] -Add more tests for DrawThemeParentBackground. Modified: trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c Modified: trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/DrawThem… ============================================================================== --- trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c [iso-8859-1] (original) +++ trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c [iso-8859-1] Wed Mar 8 14:46:36 2017 @@ -59,11 +59,25 @@ hWnd1 = CreateWindowW(L"testClass", L"Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, NULL, NULL, NULL); ok (hWnd1 != NULL, "Expected CreateWindowW to succeed\n"); + + hWnd2 = CreateWindowW(L"testClass", L"test window", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, hWnd1, NULL, NULL, NULL); + ok (hWnd2 != NULL, "Expected CreateWindowW to succeed\n"); + + FlushMessages(); + EMPTY_CACHE(); + + hdc = GetDC(hWnd1); + + DrawThemeParentBackground(hWnd2, hdc, NULL); + FlushMessages(); + COMPARE_CACHE(draw_parent_chain); + + DrawThemeParentBackground(hWnd1, hdc, NULL); + FlushMessages(); + COMPARE_CACHE(empty_chain); + ShowWindow(hWnd1, SW_SHOW); UpdateWindow(hWnd1); - - hWnd2 = CreateWindowW(L"testClass", L"test window", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, hWnd1, NULL, NULL, NULL); - ok (hWnd2 != NULL, "Expected CreateWindowW to succeed\n"); ShowWindow(hWnd2, SW_SHOW); UpdateWindow(hWnd2); @@ -77,9 +91,7 @@ DrawThemeParentBackground(hWnd1, NULL, NULL); FlushMessages(); COMPARE_CACHE(empty_chain); - - hdc = GetDC(hWnd1); - + DrawThemeParentBackground(hWnd2, hdc, NULL); FlushMessages(); COMPARE_CACHE(draw_parent_chain); @@ -99,7 +111,96 @@ COMPARE_CACHE(empty_chain); } +BOOL bGotException; + +static LONG WINAPI VEHandler_1(PEXCEPTION_POINTERS ExceptionInfo) +{ + ok(FALSE, "VEHandler_1 called!\n"); + return EXCEPTION_CONTINUE_SEARCH; +} + +static LONG WINAPI VEHandler_2(PEXCEPTION_POINTERS ExceptionInfo) +{ + bGotException = TRUE; + return EXCEPTION_CONTINUE_SEARCH; +} + +void Test_Params() +{ + HRESULT hr; + HDC hdc; + PVOID pVEH; + + bGotException = FALSE; + + pVEH = AddVectoredExceptionHandler(1, VEHandler_1); + + hr = DrawThemeParentBackground(NULL, NULL, NULL); + ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); + + hr = DrawThemeParentBackground((HWND)0xdeaddead, NULL, NULL); + ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); + + hr = DrawThemeParentBackground(NULL, (HDC)0xdeaddead, NULL); + ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); + + hr = DrawThemeParentBackground((HWND)0xdeaddead, (HDC)0xdeaddead, NULL); + ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); + + RemoveVectoredExceptionHandler(pVEH); + + RegisterSimpleClass(DefWindowProcW, L"testClass2"); + + hWnd1 = CreateWindowW(L"testClass2", L"Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, NULL, NULL, NULL); + ok (hWnd1 != NULL, "Expected CreateWindowW to succeed\n"); + hWnd2 = CreateWindowW(L"testClass2", L"test window", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, hWnd1, NULL, NULL, NULL); + ok (hWnd2 != NULL, "Expected CreateWindowW to succeed\n"); + + ShowWindow(hWnd1, SW_SHOW); + UpdateWindow(hWnd1); + ShowWindow(hWnd2, SW_SHOW); + UpdateWindow(hWnd2); + + hr = DrawThemeParentBackground(hWnd1, NULL, NULL); + ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); + + hdc = GetDC(hWnd1); + ok (hdc != NULL, "Expected GetDC to succeed\n"); + + hr = DrawThemeParentBackground(NULL, hdc, NULL); + ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); + + hr = DrawThemeParentBackground(hWnd1, hdc, NULL); + ok (hr == S_OK, "Expected success got 0x%lx error\n", hr); + + pVEH = AddVectoredExceptionHandler(1, VEHandler_2); + hr = DrawThemeParentBackground(hWnd1, hdc, (RECT*)0xdeaddead); + ok (hr == E_POINTER, "Expected success got 0x%lx error\n", hr); + RemoveVectoredExceptionHandler(pVEH); + ok (bGotException == TRUE, "Excepted a handled exception\n"); + + hr = DrawThemeParentBackground(hWnd2, NULL, NULL); + ok (hr == E_HANDLE, "Expected E_HANDLE got 0x%lx error\n", hr); + + hr = DrawThemeParentBackground(hWnd2, hdc, NULL); + ok (hr == S_FALSE, "Expected S_FALSE got 0x%lx error\n", hr); + + ReleaseDC(hWnd1, hdc); + hdc = GetDC(hWnd2); + ok (hdc != NULL, "Expected GetDC to succeed\n"); + + hr = DrawThemeParentBackground(hWnd1, hdc, NULL); + ok (hr == S_OK, "Expected success got 0x%lx error\n", hr); + + hr = DrawThemeParentBackground(hWnd2, hdc, NULL); + ok (hr == S_FALSE, "Expected S_FALSE got 0x%lx error\n", hr); + ReleaseDC(hWnd2, hdc); + + +} + START_TEST(DrawThemeParentBackground) { Test_Messages(); + Test_Params(); }

7 years, 9 months

[dreimer] 74124: [CLT2017] Make CLT logo a bit more... on screen

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Mar 7 22:34:08 2017 New Revision: 74124 URL: http://svn.reactos.org/svn/reactos?rev=74124&view=rev Log: [CLT2017] Make CLT logo a bit more... on screen Modified: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.bmp branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.jpg branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_2.jpg Modified: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary files - no diff available.

7 years, 9 months

[gadamopoulos] 74123: [USER32_APITEST] -Move the helper functions in the common include directory [UXTHEME_APITEST] -Use the helper functions to test the messages sent by DrawThemeParentBackground

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Mar 7 22:29:48 2017 New Revision: 74123 URL: http://svn.reactos.org/svn/reactos?rev=74123&view=rev Log: [USER32_APITEST] -Move the helper functions in the common include directory [UXTHEME_APITEST] -Use the helper functions to test the messages sent by DrawThemeParentBackground Added: trunk/rostests/apitests/include/msgtrace.c - copied, changed from r74111, trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/include/msgtrace.h - copied, changed from r74111, trunk/rostests/apitests/user32/helper.h trunk/rostests/apitests/include/user32testhelpers.h (with props) trunk/rostests/apitests/uxtheme/ trunk/rostests/apitests/uxtheme/CMakeLists.txt (with props) trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c (with props) trunk/rostests/apitests/uxtheme/testlist.c (with props) Removed: trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/helper.h Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/user32/AttachThreadInput.c trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/DeferWindowPos.c trunk/rostests/apitests/user32/GetDCEx.c trunk/rostests/apitests/user32/RegisterClassEx.c trunk/rostests/apitests/user32/SendMessageTimeout.c trunk/rostests/apitests/user32/SetActiveWindow.c trunk/rostests/apitests/user32/SetParent.c trunk/rostests/apitests/user32/SetProp.c trunk/rostests/apitests/user32/SystemParametersInfo.c trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/desktop.c Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -34,6 +34,7 @@ add_subdirectory(user32) add_subdirectory(user32_dynamic) add_subdirectory(userenv) +add_subdirectory(uxtheme) if(NOT ARCH STREQUAL "amd64" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_subdirectory(win32kdll) add_subdirectory(win32nt) Copied: trunk/rostests/apitests/include/msgtrace.c (from r74111, trunk/rostests/apitests/user32/helper.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/msgtrace… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/include/msgtrace.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -9,7 +9,7 @@ #include <stdio.h> #include <winuser.h> -#include "helper.h" +#include <msgtrace.h> #include <undocuser.h> MSG_CACHE default_cache = { @@ -58,6 +58,10 @@ case WM_SETICON: return "WM_SETICON"; case WM_KEYDOWN: return "WM_KEYDOWN"; case WM_KEYUP: return "WM_KEYUP"; + case WM_NOTIFY: return "WM_NOTIFY"; + case WM_COMMAND: return "WM_COMMAND"; + case WM_PRINTCLIENT: return "WM_PRINTCLIENT"; + case WM_CTLCOLORSTATIC: return "WM_CTLCOLORSTATIC"; default: return NULL; } } @@ -203,16 +207,3 @@ cache->count++; } - -ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName) -{ - WNDCLASSEXW wcex; - - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(WNDCLASSEX); - wcex.lpfnWndProc = lpfnWndProc; - wcex.hCursor = LoadCursor(NULL, IDC_ARROW); - wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wcex.lpszClassName = lpszClassName; - return RegisterClassExW(&wcex); -} Copied: trunk/rostests/apitests/include/msgtrace.h (from r74111, trunk/rostests/apitests/user32/helper.h) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/msgtrace… ============================================================================== --- trunk/rostests/apitests/user32/helper.h [iso-8859-1] (original) +++ trunk/rostests/apitests/include/msgtrace.h [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -1,3 +1,5 @@ +#ifndef APITESTS_MSGTRACE_H +#define APITESTS_MSGTRACE_H typedef enum _MSG_TYPE { @@ -30,8 +32,6 @@ void compare_cache(MSG_CACHE* cache, const char* file, int line, MSG_ENTRY *msg_chain); void trace_cache(MSG_CACHE* cache, const char* file, int line); void empty_message_cache(MSG_CACHE* cache); - -ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName); /* filter messages that are affected by dwm */ static inline BOOL IsDWmMsg(UINT msg) @@ -68,3 +68,5 @@ if(notexpected) \ ok((status & (notexpected))!=(notexpected), "wrong queue status. got non expected %li\n", (DWORD)(notexpected)); \ } + +#endif Added: trunk/rostests/apitests/include/user32testhelpers.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/user32te… ============================================================================== --- trunk/rostests/apitests/include/user32testhelpers.h (added) +++ trunk/rostests/apitests/include/user32testhelpers.h [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -0,0 +1,13 @@ + +static __inline ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName) +{ + WNDCLASSEXW wcex; + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(WNDCLASSEX); + wcex.lpfnWndProc = lpfnWndProc; + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcex.lpszClassName = lpszClassName; + return RegisterClassExW(&wcex); +} Propchange: trunk/rostests/apitests/include/user32testhelpers.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -9,7 +9,8 @@ #include <wingdi.h> #include <winuser.h> -#include "helper.h" +#include <msgtrace.h> +#include <user32testhelpers.h> #define DESKTOP_ALL_ACCESS 0x01ff Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -1,7 +1,7 @@ list(APPEND SOURCE AttachThreadInput.c - helper.c + ../include/msgtrace.c CreateDialog.c CreateIconFromResourceEx.c CreateWindowEx.c Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -8,8 +8,9 @@ #include <apitest.h> #include <winuser.h> -#include "helper.h" #include <undocuser.h> +#include <msgtrace.h> +#include <user32testhelpers.h> HWND hWnd1, hWnd2, hWnd3, hWnd4; Modified: trunk/rostests/apitests/user32/GetDCEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetDCEx.c… ============================================================================== --- trunk/rostests/apitests/user32/GetDCEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetDCEx.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -8,7 +8,6 @@ #include <stdio.h> #include <wine/test.h> #include <windows.h> -#include "helper.h" #define DCX_USESTYLE 0x00010000 Modified: trunk/rostests/apitests/user32/RegisterClassEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RegisterC… ============================================================================== --- trunk/rostests/apitests/user32/RegisterClassEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RegisterClassEx.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -12,7 +12,6 @@ #include <wchar.h> #include <wingdi.h> #include <winuser.h> -#include "helper.h" #include <undocuser.h> static ATOM _RegisterClass(LPCWSTR lpwszClassName, HINSTANCE hInstance, UINT style, WNDPROC lpfnWndProc) Modified: trunk/rostests/apitests/user32/SendMessageTimeout.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SendMessa… ============================================================================== --- trunk/rostests/apitests/user32/SendMessageTimeout.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SendMessageTimeout.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -7,7 +7,9 @@ #include <apitest.h> #include <winuser.h> -#include "helper.h" + +#include <msgtrace.h> +#include <user32testhelpers.h> static DWORD dwThread1; static DWORD dwThread2; Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -9,8 +9,10 @@ #include <wingdi.h> #include <winuser.h> -#include "helper.h" #include <undocuser.h> + +#include <msgtrace.h> +#include <user32testhelpers.h> HWND hWnd1, hWnd2; Modified: trunk/rostests/apitests/user32/SetParent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetParent… ============================================================================== --- trunk/rostests/apitests/user32/SetParent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetParent.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -8,7 +8,8 @@ #include <apitest.h> #include <winuser.h> -#include "helper.h" +#include <msgtrace.h> +#include <user32testhelpers.h> static HWND hWndList[5 + 1]; static const int hWndCount = sizeof(hWndList) / sizeof(hWndList[0]) - 1; Modified: trunk/rostests/apitests/user32/SetProp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetProp.c… ============================================================================== --- trunk/rostests/apitests/user32/SetProp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetProp.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -6,9 +6,8 @@ */ #include <apitest.h> - #include <winuser.h> -#include "helper.h" +#include <user32testhelpers.h> static ATOM Atom1, Atom2, Atom3; Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -9,8 +9,10 @@ #include <wingdi.h> #include <winuser.h> -#include "helper.h" #include <undocuser.h> + +#include <msgtrace.h> +#include <user32testhelpers.h> HWND hWnd1, hWnd2; Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -6,11 +6,12 @@ */ #include <apitest.h> - #include <wingdi.h> #include <winuser.h> -#include "helper.h" #include <undocuser.h> + +#include <msgtrace.h> +#include <user32testhelpers.h> HWND hWnd1, hWnd2, hWnd3; HHOOK hMouseHookLL, hMouseHook; Modified: trunk/rostests/apitests/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c… ============================================================================== --- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -12,7 +12,7 @@ #include <stdio.h> #include <wingdi.h> #include <winuser.h> -#include "helper.h" +#include <user32testhelpers.h> #include <ndk/umtypes.h> #include <ndk/obfuncs.h> Removed: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c (removed) @@ -1,218 +0,0 @@ -/* - * PROJECT: ReactOS api tests - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: helper functions - * PROGRAMMERS: Giannis Adamopoulos - */ - -#include <apitest.h> - -#include <stdio.h> -#include <winuser.h> -#include "helper.h" -#include <undocuser.h> - -MSG_CACHE default_cache = { -#ifdef _MSC_VER - 0 -#endif -}; -MSG_ENTRY empty_chain[]= {{0,0}}; - -static char* get_msg_name(UINT msg) -{ - switch(msg) - { - case WM_CREATE: return "WM_CREATE"; - case WM_NCCREATE: return "WM_NCCREATE"; - case WM_PARENTNOTIFY: return "WM_PARENTNOTIFY"; - case WM_DESTROY: return "WM_DESTROY"; - case WM_NCDESTROY: return "WM_NCDESTROY"; - case WM_CHILDACTIVATE: return "WM_CHILDACTIVATE"; - case WM_NCACTIVATE: return "WM_NCACTIVATE"; - case WM_ACTIVATE: return "WM_ACTIVATE"; - case WM_ACTIVATEAPP: return "WM_ACTIVATEAPP"; - case WM_WINDOWPOSCHANGING: return "WM_WINDOWPOSCHANGING"; - case WM_WINDOWPOSCHANGED: return "WM_WINDOWPOSCHANGED"; - case WM_SETFOCUS: return "WM_SETFOCUS"; - case WM_KILLFOCUS: return "WM_KILLFOCUS"; - case WM_NCPAINT: return "WM_NCPAINT"; - case WM_PAINT: return "WM_PAINT"; - case WM_ERASEBKGND: return "WM_ERASEBKGND"; - case WM_SIZE: return "WM_SIZE"; - case WM_MOVE: return "WM_MOVE"; - case WM_SHOWWINDOW: return "WM_SHOWWINDOW"; - case WM_QUERYNEWPALETTE: return "WM_QUERYNEWPALETTE"; - case WM_MOUSELEAVE: return "WM_MOUSELEAVE"; - case WM_MOUSEHOVER: return "WM_MOUSEHOVER"; - case WM_NCMOUSELEAVE: return "WM_NCMOUSELEAVE"; - case WM_NCMOUSEHOVER: return "WM_NCMOUSEHOVER"; - case WM_NCHITTEST: return "WM_NCHITTEST"; - case WM_SETCURSOR: return "WM_SETCURSOR"; - case WM_MOUSEMOVE: return "WM_MOUSEMOVE"; - case WM_SYSTIMER: return "WM_SYSTIMER"; - case WM_GETMINMAXINFO: return "WM_GETMINMAXINFO"; - case WM_NCCALCSIZE: return "WM_NCCALCSIZE"; - case WM_SETTINGCHANGE: return "WM_SETTINGCHANGE"; - case WM_GETICON: return "WM_GETICON"; - case WM_SETICON: return "WM_SETICON"; - case WM_KEYDOWN: return "WM_KEYDOWN"; - case WM_KEYUP: return "WM_KEYUP"; - default: return NULL; - } -} - -static char* get_hook_name(UINT id) -{ - switch (id) - { - case WH_KEYBOARD: return "WH_KEYBOARD"; - case WH_KEYBOARD_LL: return "WH_KEYBOARD_LL"; - case WH_MOUSE: return "WH_MOUSE"; - case WH_MOUSE_LL: return "WH_MOUSE_LL"; - default: return NULL; - } -} - -void empty_message_cache(MSG_CACHE* cache) -{ - memset(cache, 0, sizeof(MSG_CACHE)); -} - -void sprintf_msg_entry(char* buffer, MSG_ENTRY* msg) -{ - if(!msg->iwnd && !msg->msg) - { - sprintf(buffer, "nothing"); - } - else - { - char* msgName; - char* msgType; - - switch (msg->type) - { - case POST: - msgName = get_msg_name(msg->msg); - msgType = "post msg"; - break; - case SENT: - msgName = get_msg_name(msg->msg); - msgType = "sent msg"; - break; - case HOOK: - msgName = get_hook_name(msg->msg); - msgType = "hook"; - break; - case EVENT: - msgName = NULL; - msgType = "event"; - break; - default: - return; - } - - if(msgName) - sprintf(buffer, "hwnd%d %s %s %d %d", msg->iwnd, msgType, msgName, msg->param1, msg->param2); - else - sprintf(buffer, "hwnd%d %s %d %d %d", msg->iwnd, msgType, msg->msg, msg->param1, msg->param2); - } -} - -void trace_cache(MSG_CACHE* cache, const char* file, int line) -{ - int i; - char buff[100]; - - for (i=0; i < cache->count; i++) - { - sprintf_msg_entry(buff, &cache->message_cache[i]); - trace_(file,line)("%d: %s\n", i, buff); - } - trace_(file,line)("\n"); -} - -void compare_cache(MSG_CACHE* cache, const char* file, int line, MSG_ENTRY *msg_chain) -{ - int i = 0; - char buffGot[100], buffExp[100]; - BOOL got_error = FALSE; - - while(1) - { - BOOL same = !memcmp(&cache->message_cache[i],msg_chain, sizeof(MSG_ENTRY)); - - sprintf_msg_entry(buffGot, &cache->message_cache[i]); - sprintf_msg_entry(buffExp, msg_chain); - ok_(file,line)(same,"%d: got %s, expected %s\n",i, buffGot, buffExp); - - if(!got_error && !same) - got_error = TRUE; - - if(msg_chain->msg !=0 || msg_chain->iwnd != 0) - msg_chain++; - else - { - if(i > cache->count) - break; - } - i++; - } - - if(got_error ) - { - trace_(file,line)("The complete list of messages got is:\n"); - trace_cache(cache, file,line); - } - - empty_message_cache(cache); -} - -void record_message(MSG_CACHE* cache, int iwnd, UINT message, MSG_TYPE type, int param1,int param2) -{ - if(cache->count >= 100) - { - return; - } - - /* do not report a post message a second time */ - if(type == SENT && - cache->last_post_message.iwnd == iwnd && - cache->last_post_message.msg == message && - cache->last_post_message.param1 == param1 && - cache->last_post_message.param2 == param2) - { - memset(&cache->last_post_message, 0, sizeof(MSG_ENTRY)); - return; - } - - cache->message_cache[cache->count].iwnd = iwnd; - cache->message_cache[cache->count].msg = message; - cache->message_cache[cache->count].type = type; - cache->message_cache[cache->count].param1 = param1; - cache->message_cache[cache->count].param2 = param2; - - if(cache->message_cache[cache->count].type == POST) - { - cache->last_post_message = cache->message_cache[cache->count]; - } - else - { - memset(&cache->last_post_message, 0, sizeof(MSG_ENTRY)); - } - - cache->count++; -} - -ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName) -{ - WNDCLASSEXW wcex; - - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(WNDCLASSEX); - wcex.lpfnWndProc = lpfnWndProc; - wcex.hCursor = LoadCursor(NULL, IDC_ARROW); - wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wcex.lpszClassName = lpszClassName; - return RegisterClassExW(&wcex); -} Removed: trunk/rostests/apitests/user32/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.h?… ============================================================================== --- trunk/rostests/apitests/user32/helper.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.h (removed) @@ -1,70 +0,0 @@ - -typedef enum _MSG_TYPE -{ - SENT, - POST, - HOOK, - EVENT -} MSG_TYPE; - -typedef struct _MSG_ENTRY -{ - int iwnd; - UINT msg; - MSG_TYPE type; - int param1; - int param2; -} MSG_ENTRY; - -typedef struct _MSG_CACHE -{ - MSG_ENTRY last_post_message; - MSG_ENTRY message_cache[100]; - int count; -} MSG_CACHE; - -extern MSG_ENTRY empty_chain[]; -extern MSG_CACHE default_cache; - -void record_message(MSG_CACHE* cache, int iwnd, UINT message, MSG_TYPE type, int param1,int param2); -void compare_cache(MSG_CACHE* cache, const char* file, int line, MSG_ENTRY *msg_chain); -void trace_cache(MSG_CACHE* cache, const char* file, int line); -void empty_message_cache(MSG_CACHE* cache); - -ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName); - -/* filter messages that are affected by dwm */ -static inline BOOL IsDWmMsg(UINT msg) -{ - switch(msg) - { - case WM_NCPAINT: - case WM_ERASEBKGND: - case WM_PAINT: - case 0x031f: /*WM_DWMNCRENDERINGCHANGED*/ - return TRUE; - } - return FALSE; -} - -static inline BOOL IseKeyMsg(UINT msg) -{ - return (msg == WM_KEYUP || msg == WM_KEYDOWN); -} - -#define COMPARE_CACHE(msg_chain) compare_cache(&default_cache, __FILE__, __LINE__, msg_chain) -#define TRACE_CACHE() trace_cache(&default_cache, __FILE__, __LINE__) -#define EMPTY_CACHE() empty_message_cache(&default_cache); -#define RECORD_MESSAGE(...) record_message(&default_cache, ##__VA_ARGS__); - -#define COMPARE_CACHE_(cache, msg_chain) compare_cache(cache, __FILE__, __LINE__, msg_chain) -#define TRACE_CACHE_(cache) trace_cache(cache, __FILE__, __LINE__) -#define EMPTY_CACHE_(cache) empty_message_cache(cache); - -#define EXPECT_QUEUE_STATUS(expected, notexpected) \ - { \ - DWORD status = HIWORD(GetQueueStatus(QS_ALLEVENTS)); \ - ok(((status) & (expected))== (expected),"wrong queue status. expected %li, and got %li\n", (DWORD)(expected), status); \ - if(notexpected) \ - ok((status & (notexpected))!=(notexpected), "wrong queue status. got non expected %li\n", (DWORD)(notexpected)); \ - } Added: trunk/rostests/apitests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/CMakeLis… ============================================================================== --- trunk/rostests/apitests/uxtheme/CMakeLists.txt (added) +++ trunk/rostests/apitests/uxtheme/CMakeLists.txt [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -0,0 +1,11 @@ + +list(APPEND SOURCE + DrawThemeParentBackground.c + ../include/msgtrace.c + testlist.c) + +add_executable(uxtheme_apitest ${SOURCE}) +target_link_libraries(uxtheme_apitest wine ${PSEH_LIB}) +set_module_type(uxtheme_apitest win32cui) +add_importlibs(uxtheme_apitest uxtheme comctl32 user32 msvcrt kernel32) +add_rostests_file(TARGET uxtheme_apitest) Propchange: trunk/rostests/apitests/uxtheme/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/DrawThem… ============================================================================== --- trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c (added) +++ trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -0,0 +1,105 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for DrawThemeParentBackground + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <apitest.h> +#include <stdio.h> +#include <windows.h> +#include <uxtheme.h> +#include <undocuser.h> +#include <msgtrace.h> +#include <user32testhelpers.h> + +HWND hWnd1, hWnd2; + +static int get_iwnd(HWND hWnd) +{ + if(hWnd == hWnd1) return 1; + else if(hWnd == hWnd2) return 2; + else return 0; +} + +static LRESULT CALLBACK TestProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int iwnd = get_iwnd(hwnd); + + if(message > WM_USER || !iwnd || message == WM_GETICON) + return DefWindowProc(hwnd, message, wParam, lParam); + + RECORD_MESSAGE(iwnd, message, SENT, 0,0); + return DefWindowProc(hwnd, message, wParam, lParam); +} + +static void FlushMessages() +{ + MSG msg; + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd); + if(iwnd && msg.message <= WM_USER) + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); + DispatchMessageW( &msg ); + } +} + +MSG_ENTRY draw_parent_chain[]={{1, WM_ERASEBKGND}, + {1, WM_PRINTCLIENT}, + {0,0}}; + +void Test_Messages() +{ + HDC hdc; + RECT rc; + + RegisterSimpleClass(TestProc, L"testClass"); + + hWnd1 = CreateWindowW(L"testClass", L"Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, NULL, NULL, NULL); + ok (hWnd1 != NULL, "Expected CreateWindowW to succeed\n"); + ShowWindow(hWnd1, SW_SHOW); + UpdateWindow(hWnd1); + + hWnd2 = CreateWindowW(L"testClass", L"test window", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, hWnd1, NULL, NULL, NULL); + ok (hWnd2 != NULL, "Expected CreateWindowW to succeed\n"); + ShowWindow(hWnd2, SW_SHOW); + UpdateWindow(hWnd2); + + FlushMessages(); + EMPTY_CACHE(); + + DrawThemeParentBackground(hWnd2, NULL, NULL); + FlushMessages(); + COMPARE_CACHE(empty_chain); + + DrawThemeParentBackground(hWnd1, NULL, NULL); + FlushMessages(); + COMPARE_CACHE(empty_chain); + + hdc = GetDC(hWnd1); + + DrawThemeParentBackground(hWnd2, hdc, NULL); + FlushMessages(); + COMPARE_CACHE(draw_parent_chain); + + DrawThemeParentBackground(hWnd1, hdc, NULL); + FlushMessages(); + COMPARE_CACHE(empty_chain); + + memset(&rc, 0, sizeof(rc)); + + DrawThemeParentBackground(hWnd2, hdc, &rc); + FlushMessages(); + COMPARE_CACHE(draw_parent_chain); + + DrawThemeParentBackground(hWnd1, hdc, &rc); + FlushMessages(); + COMPARE_CACHE(empty_chain); +} + +START_TEST(DrawThemeParentBackground) +{ + Test_Messages(); +} Propchange: trunk/rostests/apitests/uxtheme/DrawThemeParentBackground.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/uxtheme/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/testlist… ============================================================================== --- trunk/rostests/apitests/uxtheme/testlist.c (added) +++ trunk/rostests/apitests/uxtheme/testlist.c [iso-8859-1] Tue Mar 7 22:29:48 2017 @@ -0,0 +1,12 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_DrawThemeParentBackground(void); + +const struct test winetest_testlist[] = +{ + { "DrawThemeParentBackground", func_DrawThemeParentBackground }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/uxtheme/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 9 months

[dreimer] 74122: [CLT2017] Add wallpapers to ISO

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Mar 7 22:13:23 2017 New Revision: 74122 URL: http://svn.reactos.org/svn/reactos?rev=74122&view=rev Log: [CLT2017] Add wallpapers to ISO Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_DeepSea_16-9_1920x1080.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_DeepSea_4-3_1440x1080.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_16-9_1920x1080.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_4-3_1024x768.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_4-3_1440x1080.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Blue_16-9.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Blue_4-3.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Dark_16-9.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Dark_4-3.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Light_16-9.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Light_4-3.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky4_16x9.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky4_4x3.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky5_16x9.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky5_4x3.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky7_16x9.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky7_4x3.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/CMakeLists.txt (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.bmp (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_2.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesBlue_1.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesBlue_2.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesGold_1.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesGold_2.jpg (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReadMe.txt (with props) branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/lake.jpg (with props) Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hivedef.inf Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Tue Mar 7 22:13:23 2017 @@ -64,9 +64,9 @@ HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" HKCU,"Control Panel\Desktop","Pattern",2,"(None)" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Web\Wallpaper\ReactOS_CLT_1.bmp" HKCU,"Control Panel\Desktop","TileWallpaper",2,"0" -HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2" +HKCU,"Control Panel\Desktop","WallpaperStyle",2,"0" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_DeepSea_16-9_1920x1080.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_DeepSea_16-9_1920x1080.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_DeepSea_4-3_1440x1080.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_DeepSea_4-3_1440x1080.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_16-9_1920x1080.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_16-9_1920x1080.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_4-3_1024x768.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_4-3_1024x768.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_4-3_1440x1080.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ROSWP_4-3_1440x1080.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Blue_16-9.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Blue_16-9.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Blue_4-3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Blue_4-3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Dark_16-9.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Dark_16-9.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Dark_4-3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Dark_4-3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Light_16-9.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Light_16-9.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Light_4-3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_ReactOS_Light_4-3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky4_16x9.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky4_16x9.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky4_4x3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky4_4x3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky5_16x9.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky5_16x9.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky5_4x3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky5_4x3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky7_16x9.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky7_16x9.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky7_4x3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/Angelus_Sky7_4x3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/CMakeLists.txt (added) +++ branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/CMakeLists.txt [iso-8859-1] Tue Mar 7 22:13:23 2017 @@ -0,0 +1,32 @@ + +list(APPEND WALLPAPER_FILES + Angelus_DeepSea_16-9_1920x1080.jpg + Angelus_DeepSea_4-3_1440x1080.jpg + Angelus_ReactOS_Blue_16-9.jpg + Angelus_ReactOS_Blue_4-3.jpg + Angelus_ReactOS_Dark_16-9.jpg + Angelus_ReactOS_Dark_4-3.jpg + Angelus_ReactOS_Light_16-9.jpg + Angelus_ReactOS_Light_4-3.jpg + Angelus_ROSWP_16-9_1920x1080.jpg + Angelus_ROSWP_4-3_1024x768.jpg + Angelus_ROSWP_4-3_1440x1080.jpg + Angelus_Sky4_16x9.jpg + Angelus_Sky4_4x3.jpg + Angelus_Sky5_16x9.jpg + Angelus_Sky5_4x3.jpg + Angelus_Sky7_16x9.jpg + Angelus_Sky7_4x3.jpg + lake.jpg + ReactOS_CirclesBlue_1.jpg + ReactOS_CirclesBlue_2.jpg + ReactOS_CirclesGold_1.jpg + ReactOS_CirclesGold_2.jpg + ReactOS_CLT_1.bmp + ReactOS_CLT_1.jpg + ReactOS_CLT_2.jpg + ReadMe.txt) + +foreach(item ${WALLPAPER_FILES}) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Web/Wallpaper FOR all) +endforeach(item) Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_1.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CLT_2.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesBlue_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesBlue_1.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesBlue_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesBlue_2.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesGold_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesGold_1.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesGold_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReactOS_CirclesGold_2.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReadMe.txt (added) +++ branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReadMe.txt [iso-8859-1] Tue Mar 7 22:13:23 2017 @@ -0,0 +1,21 @@ +Wallpapers +=========== + +Most of the wallpapers are adapted from the original ones for the CLT 2017. + +File Name | Author | Origin +-------------------------------------------------------------------------------------------------------------------------------------------------- +Angelus collection | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 +lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 +ReactOS_CirclesBlue_1.jpg | Forum user "henrytang5247" (Henry Tang) | http://www.reactos.org/forum/viewtopic.php?p=109529#p109529 +ReactOS_CirclesBlue_2.jpg | See above | See above +ReactOS_CirclesGold_1.jpg | See above | See above +ReactOS_CirclesGold_2.jpg | See above | See above +ReactOS_CLT_1.jpg | CLT version of ReactOS_CirclesGold_1.jpg | See above +ReactOS_CLT_2.jpg | CLT version of ReactOS_CirclesGold_2.jpg | See above + +Angelus' Wallpapers +=================== +Forum User "Angelus" (jedi.knight(a)wanadoo.es) +Under Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. +See forum thread: http://www.reactos.org/forum/viewtopic.php?f=25&t=6153 Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/ReadMe.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/lake.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/modules/wallpapers/lake.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

7 years, 9 months

[hbelusca] 74121: [NTOS]: Modify the ReactOS boot logo for the CLT 2017 edition, similarly to what was done for FOSDEM 2017.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 6 23:37:31 2017 New Revision: 74121 URL: http://svn.reactos.org/svn/reactos?rev=74121&view=rev Log: [NTOS]: Modify the ReactOS boot logo for the CLT 2017 edition, similarly to what was done for FOSDEM 2017. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/1.bmp branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/2.bmp branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/3.bmp branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/4.bmp branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/5.bmp branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/8.bmp Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/n… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/n… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/n… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/n… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/n… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/n… ============================================================================== Binary files - no diff available.

7 years, 9 months

[gadamopoulos] 74120: [COMCTL32] -Buttons with the BS_PUSHLIKE style are drawn as if they were BS_PUSHBUTTON. Fixes the appearance of buttons in the advanced appearance dialog.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 6 21:57:10 2017 New Revision: 74120 URL: http://svn.reactos.org/svn/reactos?rev=74120&view=rev Log: [COMCTL32] -Buttons with the BS_PUSHLIKE style are drawn as if they were BS_PUSHBUTTON. Fixes the appearance of buttons in the advanced appearance dialog. Modified: trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Mon Mar 6 21:57:10 2017 @@ -335,13 +335,19 @@ { DWORD dwStyle; DWORD dwStyleEx; + DWORD type; UINT dtFlags; int state; ButtonState drawState; pfThemedPaint paint; dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; + type = dwStyle & BUTTON_TYPE; + + if (type != BS_PUSHBUTTON && type != BS_DEFPUSHBUTTON && (dwStyle & BS_PUSHLIKE)) + type = BS_PUSHBUTTON; + + paint = btnThemedPaintFunc[type]; if (!paint) return FALSE; @@ -361,7 +367,7 @@ } else drawState = STATE_DISABLED; - if (drawState == STATE_NORMAL && (dwStyle & BUTTON_TYPE) == BS_DEFPUSHBUTTON) + if (drawState == STATE_NORMAL && type == BS_DEFPUSHBUTTON) { drawState = STATE_DEFAULTED; }

7 years, 9 months

[hbelusca] 74119: [KERNEL32]: Check for NULL pointer specified to lstrlenA/W and return null length, as specified in the MSDN doc and checked by the tests of r74118. This should remove the unwanted...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 6 19:17:53 2017 New Revision: 74119 URL: http://svn.reactos.org/svn/reactos?rev=74119&view=rev Log: [KERNEL32]: Check for NULL pointer specified to lstrlenA/W and return null length, as specified in the MSDN doc and checked by the tests of r74118. This should remove the unwanted 1st-chance exceptions caught when debugging Office 2010 installation, that calls from time to time lstrlen with NULL pointers. Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lstring.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lstring.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lstring.c [iso-8859-1] Mon Mar 6 19:17:53 2017 @@ -27,7 +27,8 @@ return 1; Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; + if (Result) + Result -= 2; return Result; } @@ -55,6 +56,7 @@ return Result; } + /* * @implemented @@ -144,6 +146,9 @@ { INT Ret = 0; + if (lpString == NULL) + return 0; + _SEH2_TRY { Ret = strlen(lpString); @@ -292,6 +297,9 @@ { INT Ret = 0; + if (lpString == NULL) + return 0; + _SEH2_TRY { Ret = wcslen(lpString);

7 years, 9 months

[hbelusca] 74118: [KERNEL32_APITEST]: Add basic tests for lstrlenA/W, focusing on its special handling of the NULL pointer. We detect that the NULL pointer is handled separately because no exceptio...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 6 19:14:27 2017 New Revision: 74118 URL: http://svn.reactos.org/svn/reactos?rev=74118&view=rev Log: [KERNEL32_APITEST]: Add basic tests for lstrlenA/W, focusing on its special handling of the NULL pointer. We detect that the NULL pointer is handled separately because no exception is generated, contrary to when the function is called with truly invalid pointers. I thank Mark for having mentioned the vectored exception handling to me, needed to catch first-chance exceptions. Added: trunk/rostests/apitests/kernel32/lstrlen.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Mon Mar 6 19:14:27 2017 @@ -14,6 +14,7 @@ interlck.c LoadLibraryExW.c lstrcpynW.c + lstrlen.c MultiByteToWideChar.c PrivMoveFileIdentityW.c SetConsoleWindowInfo.c Added: trunk/rostests/apitests/kernel32/lstrlen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/lstrlen… ============================================================================== --- trunk/rostests/apitests/kernel32/lstrlen.c (added) +++ trunk/rostests/apitests/kernel32/lstrlen.c [iso-8859-1] Mon Mar 6 19:14:27 2017 @@ -0,0 +1,56 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for lstrlenA/W + * PROGRAMMER: Hermes Belusca-Maito + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> + +LONG WINAPI VEHandler_1(PEXCEPTION_POINTERS ExceptionInfo) +{ + /* + * Vectored Exception Handler possibly called for lstrlen(NULL). + * Expected not to be called! + */ + ok(FALSE, "VEHandler_1 called!\n"); + return EXCEPTION_CONTINUE_SEARCH; +} + +LONG WINAPI VEHandler_2(PEXCEPTION_POINTERS ExceptionInfo) +{ + /* Vectored Exception Handler that should be called for lstrlen(<invalid_ptr>) */ + ok(TRUE, "VEHandler_2 not called?\n"); + return EXCEPTION_CONTINUE_SEARCH; +} + +START_TEST(lstrlen) +{ + PVOID pVEH; + + /* Test basic functionality */ + ok(lstrlenA( "Hello World!") == 12, "lstrlenA failed!\n"); + ok(lstrlenW(L"Hello World!") == 12, "lstrlenW failed!\n"); + + /* + * NULL buffer is special and is considered separately; + * no internal exception is generated. + * Use Vectored Exception Handling to monitor for first-chance exceptions. + */ +pVEH = AddVectoredExceptionHandler(1, VEHandler_1); + ok(lstrlenA(NULL) == 0, "lstrlenA should have returned 0.\n"); + ok(lstrlenW(NULL) == 0, "lstrlenW should have returned 0.\n"); +RemoveVectoredExceptionHandler(pVEH); + + /* + * Test some invalid buffers. Internal exceptions should be generated. + * Use Vectored Exception Handling to monitor for first-chance exceptions. + */ +pVEH = AddVectoredExceptionHandler(1, VEHandler_2); + ok(lstrlenA( (LPSTR)0xbaadf00d) == 0, "lstrlenA should have returned 0.\n"); + ok(lstrlenW((LPWSTR)0xbaadf00d) == 0, "lstrlenW should have returned 0.\n"); +RemoveVectoredExceptionHandler(pVEH); +} Propchange: trunk/rostests/apitests/kernel32/lstrlen.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Mon Mar 6 19:14:27 2017 @@ -15,6 +15,7 @@ extern void func_interlck(void); extern void func_LoadLibraryExW(void); extern void func_lstrcpynW(void); +extern void func_lstrlen(void); extern void func_Mailslot(void); extern void func_MultiByteToWideChar(void); extern void func_PrivMoveFileIdentityW(void); @@ -39,6 +40,7 @@ { "interlck", func_interlck }, { "LoadLibraryExW", func_LoadLibraryExW }, { "lstrcpynW", func_lstrcpynW }, + { "lstrlen", func_lstrlen }, { "MailslotRead", func_Mailslot }, { "MultiByteToWideChar", func_MultiByteToWideChar }, { "PrivMoveFileIdentityW", func_PrivMoveFileIdentityW },

7 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
26
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 March 2017