Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 07 Mar '17

07 Mar '17

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

1 0

[dreimer] 74122: [CLT2017] Add wallpapers to ISO
by dreimer＠svn.reactos.org 07 Mar '17

07 Mar '17

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

1 0

[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 06 Mar '17

06 Mar '17

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.

1 0

[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 06 Mar '17

06 Mar '17

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; }

1 0

[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 06 Mar '17

06 Mar '17

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);

1 0

[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 06 Mar '17

06 Mar '17

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 },

1 0

[hbelusca] 74117: [PSDK][NDK]: Add AddVectoredContinueHandler, RemoveVectoredContinueHandler, and RtlRemoveVectoredExceptionHandler, RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandl...
by hbelusca＠svn.reactos.org 06 Mar '17

06 Mar '17

Author: hbelusca Date: Mon Mar 6 19:04:17 2017 New Revision: 74117 URL: http://svn.reactos.org/svn/reactos?rev=74117&view=rev Log: [PSDK][NDK]: Add AddVectoredContinueHandler, RemoveVectoredContinueHandler, and RtlRemoveVectoredExceptionHandler, RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler to our headers. Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/include/psdk/winbase.h Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Mon Mar 6 19:04:17 2017 @@ -619,6 +619,42 @@ _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler ); +NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredExceptionHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +PVOID +NTAPI +RtlAddVectoredContinueHandler( + _In_ ULONG FirstHandler, + _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler +); + +NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +VOID +NTAPI +RtlSetUnhandledExceptionFilter( + _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter +); + +NTSYSAPI +LONG +NTAPI +RtlUnhandledExceptionFilter( + _In_ struct _EXCEPTION_POINTERS* ExceptionInfo +); + __analysis_noreturn NTSYSAPI VOID @@ -628,20 +664,6 @@ _In_ PVOID FileName, _In_ ULONG LineNumber, _In_opt_z_ PCHAR Message -); - -NTSYSAPI -VOID -NTAPI -RtlSetUnhandledExceptionFilter( - _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter -); - -NTSYSAPI -LONG -NTAPI -RtlUnhandledExceptionFilter( - _In_ struct _EXCEPTION_POINTERS* ExceptionInfo ); NTSYSAPI Modified: trunk/reactos/sdk/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winbase.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] Mon Mar 6 19:04:17 2017 @@ -1467,6 +1467,7 @@ #endif #if (_WIN32_WINNT >= 0x0500) _Ret_maybenull_ PVOID WINAPI AddVectoredExceptionHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); +_Ret_maybenull_ PVOID WINAPI AddVectoredContinueHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); #endif BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD); @@ -2882,6 +2883,7 @@ BOOL WINAPI RemoveDirectoryW(LPCWSTR); #if (_WIN32_WINNT >= 0x0500) ULONG WINAPI RemoveVectoredExceptionHandler(_In_ PVOID); +ULONG WINAPI RemoveVectoredContinueHandler(_In_ PVOID); #endif #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI ReplaceFileA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _Reserved_ LPVOID, _Reserved_ LPVOID);

1 0

[jimtabor] 74116: [NtUser] - Remove scroll bar search that sends another WM_NCCALCSIZE message. Use wine as an example. See CORE-12827.
by jimtabor＠svn.reactos.org 06 Mar '17

06 Mar '17

Author: jimtabor Date: Mon Mar 6 18:28:03 2017 New Revision: 74116 URL: http://svn.reactos.org/svn/reactos?rev=74116&view=rev Log: [NtUser] - Remove scroll bar search that sends another WM_NCCALCSIZE message. Use wine as an example. See CORE-12827. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/scrollbar.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Mon Mar 6 18:28:03 2017 @@ -1171,7 +1171,8 @@ LRESULT Result = 0; SIZE WindowBorders; RECT OrigRect; - DWORD Style = Wnd->style; + LONG Style = Wnd->style; + LONG exStyle = Wnd->ExStyle; if (Rect == NULL) { @@ -1239,83 +1240,30 @@ RECTL_vInflateRect(Rect, -2 * UserGetSystemMetrics(SM_CXBORDER), -2 * UserGetSystemMetrics(SM_CYBORDER)); } - if (Wnd->style & (WS_VSCROLL | WS_HSCROLL)) - { - SCROLLBARINFO sbi; - SETSCROLLBARINFO ssbi; - - sbi.cbSize = sizeof(SCROLLBARINFO); - if ((Style & WS_VSCROLL) && co_IntGetScrollBarInfo(Wnd, OBJID_VSCROLL, &sbi)) - { - int i; - LONG sx = Rect->right; - - Wnd->state |= WNDS_HASVERTICALSCROOLLBAR; - - sx -= UserGetSystemMetrics(SM_CXVSCROLL); - - for (i = 0; i <= CCHILDREN_SCROLLBAR; i++) - ssbi.rgstate[i] = sbi.rgstate[i]; - - if (sx <= Rect->left) - ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; - else - ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - - co_IntSetScrollBarInfo(Wnd, OBJID_VSCROLL, &ssbi); - - if (ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) - Style &= ~WS_VSCROLL; - } - else - Style &= ~WS_VSCROLL; - - if ((Style & WS_HSCROLL) && co_IntGetScrollBarInfo(Wnd, OBJID_HSCROLL, &sbi)) - { - int i; - LONG sy = Rect->bottom; - - Wnd->state |= WNDS_HASHORIZONTALSCROLLBAR; - - sy -= UserGetSystemMetrics(SM_CYHSCROLL); - - for (i = 0; i <= CCHILDREN_SCROLLBAR; i++) - ssbi.rgstate[i] = sbi.rgstate[i]; - - if (sy <= Rect->top) - ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; - else - ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - - co_IntSetScrollBarInfo(Wnd, OBJID_HSCROLL, &ssbi); - - if (ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) - Style &= ~WS_HSCROLL; - } - else - Style &= ~WS_HSCROLL; - } - - if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL)) - { - if ((Wnd->ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - Rect->left += UserGetSystemMetrics(SM_CXVSCROLL); - else - Rect->right -= UserGetSystemMetrics(SM_CXVSCROLL); - - Rect->bottom -= UserGetSystemMetrics(SM_CYHSCROLL); - } - else - { - if (Style & WS_VSCROLL) + if (Style & WS_VSCROLL) + { + if (Rect->right - Rect->left >= UserGetSystemMetrics(SM_CXVSCROLL)) { - if ((Wnd->ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - Rect->left += UserGetSystemMetrics(SM_CXVSCROLL); - else - Rect->right -= UserGetSystemMetrics(SM_CXVSCROLL); + Wnd->state |= WNDS_HASVERTICALSCROOLLBAR; + + /* rectangle is in screen coords when wparam is false */ + if (!wparam && (exStyle & WS_EX_LAYOUTRTL)) exStyle ^= WS_EX_LEFTSCROLLBAR; + + if((exStyle & WS_EX_LEFTSCROLLBAR) != 0) + Rect->left += UserGetSystemMetrics(SM_CXVSCROLL); + else + Rect->right -= UserGetSystemMetrics(SM_CXVSCROLL); + } + } + + if (Style & WS_HSCROLL) + { + if( Rect->bottom - Rect->top > UserGetSystemMetrics(SM_CYHSCROLL)) + { + Wnd->state |= WNDS_HASHORIZONTALSCROLLBAR; + + Rect->bottom -= UserGetSystemMetrics(SM_CYHSCROLL); } - else if (Style & WS_HSCROLL) - Rect->bottom -= UserGetSystemMetrics(SM_CYHSCROLL); } if (Rect->top > Rect->bottom) Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Mon Mar 6 18:28:03 2017 @@ -358,6 +358,106 @@ return (Mask & SIF_ALL) !=0; } +/************************************************************************* + * SCROLL_GetScrollBarInfo + * + * Internal helper for the API function + * + * PARAMS + * hwnd [I] Handle of window with scrollbar(s) + * idObject [I] One of OBJID_CLIENT, OBJID_HSCROLL, or OBJID_VSCROLL + * info [IO] cbSize specifies the size of the structure + * + * RETURNS + * FALSE if failed + */ +#if 0 +static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) +{ + LPSCROLLBAR_INFO infoPtr; + INT nBar; + INT nDummy; + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL pressed; + RECT rect; + + switch (idObject) + { + case OBJID_CLIENT: nBar = SB_CTL; break; + case OBJID_HSCROLL: nBar = SB_HORZ; break; + case OBJID_VSCROLL: nBar = SB_VERT; break; + default: return FALSE; + } + + /* handle invalid data structure */ + if (info->cbSize != sizeof(*info)) + return FALSE; + + SCROLL_GetScrollBarRect(hwnd, nBar, &info->rcScrollBar, &nDummy, + &info->dxyLineButton, &info->xyThumbTop); + /* rcScrollBar needs to be in screen coordinates */ + GetWindowRect(hwnd, &rect); + OffsetRect(&info->rcScrollBar, rect.left, rect.top); + + info->xyThumbBottom = info->xyThumbTop + info->dxyLineButton; + + infoPtr = SCROLL_GetInternalInfo(hwnd, nBar, TRUE); + if (!infoPtr) + return FALSE; + + /* Scroll bar state */ + info->rgstate[0] = 0; + if ((nBar == SB_HORZ && !(style & WS_HSCROLL)) + || (nBar == SB_VERT && !(style & WS_VSCROLL))) + info->rgstate[0] |= STATE_SYSTEM_INVISIBLE; + if (infoPtr->minVal >= infoPtr->maxVal - max(infoPtr->page - 1, 0)) + { + if (!(info->rgstate[0] & STATE_SYSTEM_INVISIBLE)) + info->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + else + info->rgstate[0] |= STATE_SYSTEM_OFFSCREEN; + } + if (nBar == SB_CTL && !IsWindowEnabled(hwnd)) + info->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + + pressed = ((nBar == SB_VERT) == SCROLL_trackVertical && GetCapture() == hwnd); + + /* Top/left arrow button state. MSDN says top/right, but I don't believe it */ + info->rgstate[1] = 0; + if (pressed && SCROLL_trackHitTest == SCROLL_TOP_ARROW) + info->rgstate[1] |= STATE_SYSTEM_PRESSED; + if (infoPtr->flags & ESB_DISABLE_LTUP) + info->rgstate[1] |= STATE_SYSTEM_UNAVAILABLE; + + /* Page up/left region state. MSDN says up/right, but I don't believe it */ + info->rgstate[2] = 0; + if (infoPtr->curVal == infoPtr->minVal) + info->rgstate[2] |= STATE_SYSTEM_INVISIBLE; + if (pressed && SCROLL_trackHitTest == SCROLL_TOP_RECT) + info->rgstate[2] |= STATE_SYSTEM_PRESSED; + + /* Thumb state */ + info->rgstate[3] = 0; + if (pressed && SCROLL_trackHitTest == SCROLL_THUMB) + info->rgstate[3] |= STATE_SYSTEM_PRESSED; + + /* Page down/right region state. MSDN says down/left, but I don't believe it */ + info->rgstate[4] = 0; + if (infoPtr->curVal >= infoPtr->maxVal - 1) + info->rgstate[4] |= STATE_SYSTEM_INVISIBLE; + if (pressed && SCROLL_trackHitTest == SCROLL_BOTTOM_RECT) + info->rgstate[4] |= STATE_SYSTEM_PRESSED; + + /* Bottom/right arrow button state. MSDN says bottom/left, but I don't believe it */ + info->rgstate[5] = 0; + if (pressed && SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW) + info->rgstate[5] |= STATE_SYSTEM_PRESSED; + if (infoPtr->flags & ESB_DISABLE_RTDN) + info->rgstate[5] |= STATE_SYSTEM_UNAVAILABLE; + + return TRUE; +} +#endif static DWORD FASTCALL co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) { @@ -575,6 +675,21 @@ IntGetScrollBarRect(Window, Bar, &(sbi->rcScrollBar)); IntCalculateThumb(Window, Bar, sbi, pSBData); + /* Scroll bar state */ + psbi->rgstate[0] = 0; + if ((Bar == SB_HORZ && !(Window->style & WS_HSCROLL)) + || (Bar == SB_VERT && !(Window->style & WS_VSCROLL))) + psbi->rgstate[0] |= STATE_SYSTEM_INVISIBLE; + if (pSBData->posMin >= pSBData->posMax - max(pSBData->page - 1, 0)) + { + if (!(psbi->rgstate[0] & STATE_SYSTEM_INVISIBLE)) + psbi->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + else + psbi->rgstate[0] |= STATE_SYSTEM_OFFSCREEN; + } + if (Bar == SB_CTL && !(Window->style & WS_DISABLED)) + psbi->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + RtlCopyMemory(psbi, sbi, sizeof(SCROLLBARINFO)); return TRUE;

1 0

[hbelusca] 74115: [REACTOS-CLT2017]: Cherry-pick few trunk improvements/fixes: - [UXTHME] Implement drawing themed text with shadows, by Giannis (r74083) - [MKISOFS] Update mkisofs to schily-2017-0...
by hbelusca＠svn.reactos.org 06 Mar '17

06 Mar '17

Author: hbelusca Date: Mon Mar 6 00:13:43 2017 New Revision: 74115 URL: http://svn.reactos.org/svn/reactos?rev=74115&view=rev Log: [REACTOS-CLT2017]: Cherry-pick few trunk improvements/fixes: - [UXTHME] Implement drawing themed text with shadows, by Giannis (r74083) - [MKISOFS] Update mkisofs to schily-2017-02-16, by Colin (r74112) Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:13:43 2017 @@ -24,3 +24,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 +/trunk/reactos:74083,74112 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1617,6 +1617,9 @@ return E_NOTIMPL; } +typedef int (WINAPI * DRAWSHADOWTEXT)(HDC hdc, LPCWSTR pszText, UINT cch, RECT *prc, DWORD dwFlags, + COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset); + /*********************************************************************** * DrawThemeText (UXTHEME.@) */ @@ -1630,34 +1633,89 @@ LOGFONTW logfont; COLORREF textColor; COLORREF oldTextColor; + COLORREF shadowColor; + POINT ptShadowOffset; int oldBkMode; RECT rt; - + int iShadowType; + TRACE("%d %d: stub\n", iPartId, iStateId); if(!hTheme) return E_HANDLE; - + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr)) + { hFont = CreateFontIndirectW(&logfont); if(!hFont) - TRACE("Failed to create font\n"); - } + { + ERR("Failed to create font\n"); + } + } + CopyRect(&rt, pRect); if(hFont) oldFont = SelectObject(hdc, hFont); - + + oldBkMode = SetBkMode(hdc, TRANSPARENT); + if(dwTextFlags2 & DTT_GRAYED) textColor = GetSysColor(COLOR_GRAYTEXT); else { if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) textColor = GetTextColor(hdc); } + + hr = GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TEXTSHADOWTYPE, &iShadowType); + if (SUCCEEDED(hr)) + { + ERR("Got shadow type %d\n", iShadowType); + + hr = GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTSHADOWCOLOR, &shadowColor); + if (FAILED(hr)) + { + ERR("GetThemeColor failed\n"); + } + + hr = GetThemePosition(hTheme, iPartId, iStateId, TMT_TEXTSHADOWOFFSET, &ptShadowOffset); + if (FAILED(hr)) + { + ERR("GetThemePosition failed\n"); + } + + if (iShadowType == TST_SINGLE) + { + oldTextColor = SetTextColor(hdc, shadowColor); + OffsetRect(&rt, ptShadowOffset.x, ptShadowOffset.y); + DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + OffsetRect(&rt, -ptShadowOffset.x, -ptShadowOffset.y); + SetTextColor(hdc, oldTextColor); + } + else if (iShadowType == TST_CONTINUOUS) + { + HANDLE hcomctl32 = GetModuleHandleW(L"comctl32.dll"); + DRAWSHADOWTEXT pDrawShadowText; + if (!hcomctl32) + { + hcomctl32 = LoadLibraryW(L"comctl32.dll"); + if (!hcomctl32) + ERR("Failed to load comctl32\n"); + } + + pDrawShadowText = (DRAWSHADOWTEXT)GetProcAddress(hcomctl32, "DrawShadowText"); + if (pDrawShadowText) + { + pDrawShadowText(hdc, pszText, iCharCount, &rt, dwTextFlags, textColor, shadowColor, ptShadowOffset.x, ptShadowOffset.y); + goto cleanup; + } + } + } + oldTextColor = SetTextColor(hdc, textColor); - oldBkMode = SetBkMode(hdc, TRANSPARENT); DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + SetTextColor(hdc, oldTextColor); +cleanup: SetBkMode(hdc, oldBkMode); - SetTextColor(hdc, oldTextColor); if(hFont) { SelectObject(hdc, oldFont); Modified: branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -136,7 +136,7 @@ oldTextColor = SetTextColor(hdc, textColor); oldBkMode = SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + DrawThemeText(hTheme, hdc, iPartId, iStateId, pszText, iCharCount, dwTextFlags, dwTextFlags, pRect); SetBkMode(hdc, oldBkMode); SetTextColor(hdc, oldTextColor); Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,6 +1,6 @@ -/* @(#)version.h 1.92 16/01/26 Copyright 2007-2016 J. Schilling */ +/* @(#)version.h 1.93 16/12/15 Copyright 2007-2016 J. Schilling */ /* * The version for cdrtools programs */ -#define VERSION "3.02a06" +#define VERSION "3.02a07" Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,4 +1,4 @@ -/* @(#)schily.h 1.121 16/11/04 Copyright 1985-2016 J. Schilling */ +/* @(#)schily.h 1.122 16/12/18 Copyright 1985-2016 J. Schilling */ /* * Definitions for libschily * @@ -543,7 +543,7 @@ #ifdef __never__ #undef error #define error js_error -#endif +#endif /* __never__ */ #undef dprintf #define dprintf js_dprintf #undef fprintf @@ -558,9 +558,9 @@ #ifndef HAVE_SNPRINTF #undef snprintf #define snprintf js_snprintf -#endif -#endif -#endif +#endif /* HAVE_SNPRINTF */ +#endif /* SCHILY_PRINT */ +#endif /* NO_SCHILY_PRINT */ #ifndef NO_SCHILY_GETLINE /* Define to disable *getline() redirect */ #undef getline Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,11 +1,11 @@ -/* @(#)dirent.c 1.3 12/03/20 Copyright 2011 J. Schilling */ +/* @(#)dirent.c 1.4 17/02/02 Copyright 2011-2017 J. Schilling */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)dirent.c 1.3 12/03/20 Copyright 2011 J. Schilling"; + "@(#)dirent.c 1.4 17/02/02 Copyright 2011-2017 J. Schilling"; #endif /* - * Copyright (c) 2011 J. Schilling + * Copyright (c) 2011-2017 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -14,6 +14,8 @@ * with the License. * * See the file CDDL.Schily.txt in this distribution for details. + * A copy of the CDDL is also available via the Internet at + * http://www.opensource.org/licenses/cddl1.txt * * When distributing Covered Code, include this CDDL HEADER in each * file and include the License file CDDL.Schily.txt from this distribution. @@ -84,7 +86,8 @@ dp->dd_dirname[len] = '\\'; len++; } - dp->dd_dirname[len] = '*'; + dp->dd_dirname[len++] = '*'; + dp->dd_dirname[len] = '\0'; dp->dd_handle = -1; dp->dd_state = 0; Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,8 +1,8 @@ -/* @(#)mkisofs.c 1.288 16/12/13 joerg */ +/* @(#)mkisofs.c 1.289 17/01/05 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)mkisofs.c 1.288 16/12/13 joerg"; + "@(#)mkisofs.c 1.289 17/01/05 joerg"; #endif /* * Program mkisofs.c - generate iso9660 filesystem based upon directory @@ -11,7 +11,7 @@ * Written by Eric Youngdale (1993). * * Copyright 1993 Yggdrasil Computing, Incorporated - * Copyright (c) 1997-2016 J. Schilling + * Copyright (c) 1997-2017 J. Schilling * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -132,14 +132,13 @@ int all_files = 1; /* New default is to include all files */ BOOL Hflag = FALSE; /* Follow links on cmdline (-H) */ BOOL follow_links = FALSE; /* Follow all links (-L) */ -#if defined(IS_CYGWIN) || defined(__MINGW32__) || defined(_MSC_VER) +#if defined(__MINGW32__) || defined(_MSC_VER) /* - * Do not cache inodes on Cygwin by default - * See below in main(), cache for 64bit ino_t + * Never cache inodes on DOS or Win-DOS. */ int cache_inodes = 0; #else -int cache_inodes = 1; /* Cache inodes if OS has unique inodes */ +int cache_inodes = -1; /* Cache inodes if OS has unique inodes */ #endif int rationalize = 0; /* Need to call stat_fix() */ int rationalize_uid = 0; @@ -2088,14 +2087,6 @@ modification_date.l_usec = tv_begun.tv_usec; modification_date.l_gmtoff = -100; -#if defined(IS_CYGWIN) - /* - * If we have 64 bit inode numbers, Cygwin should be able to work - * correctly on NTFS. - */ - if (sizeof (ino_t) >= 8) - cache_inodes = 1; -#endif cac--; cav++; c = getvargs(&cac, &cav, GA_NO_PROPS, flags); @@ -2119,7 +2110,7 @@ if (pversion) { printf(_("mkisofs %s (%s-%s-%s)\n\n\ Copyright (C) 1993-1997 %s\n\ -Copyright (C) 1997-2016 %s\n"), +Copyright (C) 1997-2017 %s\n"), version_string, HOST_CPU, HOST_VENDOR, HOST_OS, _("Eric Youngdale"), @@ -2212,6 +2203,25 @@ (Llong)strlen(biblio)); } } +#ifdef DUPLICATES_ONCE + /* + * If -duplicates-once was specified, do not implicitly enable + * -cache-inodes. + */ + if (cache_inodes < 0 && duplicates_once) + cache_inodes = 0; +#endif +#if defined(IS_CYGWIN) + /* + * If we have 64 bit inode numbers, Cygwin should be able to work + * correctly on NTFS, otherwise disable caching unless it has + * been enforced via -cache-inodes. + */ + if (cache_inodes < 0 && sizeof (ino_t) < 8) + cache_inodes = 0; +#endif + if (cache_inodes < 0) + cache_inodes = 1; #ifdef DUPLICATES_ONCE if (!cache_inodes && !duplicates_once) { #else

1 0

[hbelusca] 74114: [REACTOS-CLT2017]: Sync with ROS 0.4.4 release branch. In particular the following fixes/hacks: - Apply the Wordpad related hack from CORE-5823 by Jared Smudde (r73624). - Disable...
by hbelusca＠svn.reactos.org 06 Mar '17

06 Mar '17

Author: hbelusca Date: Mon Mar 6 00:05:13 2017 New Revision: 74114 URL: http://svn.reactos.org/svn/reactos?rev=74114&view=rev Log: [REACTOS-CLT2017]: Sync with ROS 0.4.4 release branch. In particular the following fixes/hacks: - Apply the Wordpad related hack from CORE-5823 by Jared Smudde (r73624). - Disable COMMAND.COM debugging messages. CORE-10710 (r73625). - Add a hack by Thomas to avoid MmGetPhysicalAddress failures during USB transfers. CORE-9224 (r73627). - Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742 (r73628). - Mask WndProc exceptions CORE-11915 (r73631). Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/formatbar.bmp branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/toolbar.bmp branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:05:13 2017 @@ -16,6 +16,7 @@ /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-branch-0_4_4/reactos:73624-73625,73627-73628,73631 /branches/ros-csrss:57561-58762 /branches/shell-experiments:61927-65494 /branches/shell32_new-bringup:51893-53652,53661,53700 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/formatbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== Binary files - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:05:13 2017 @@ -19,6 +19,7 @@ /branches/ros-amd64-bringup/drivers/usb/usbehci_new:36852 /branches/ros-amd64-bringup/reactos/drivers/usb/usbehci:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-amd64-bringup/reactos/drivers/usb/usbehci_new:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_4_4/reactos/drivers/usb/usbehci:73627-73628,73631 /branches/shell32_new-bringup/drivers/usb/usbehci:51893-53652,53661,53700 /branches/shell32_new-bringup/drivers/usb/usbehci_new:51893-53652,53661,53700 /branches/tcp-rewrite-branch/drivers/usb/usbehci:48720,48840-48841,49424-49426,49454 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -601,6 +601,7 @@ // // get address // + *(volatile char *)TransferBuffer; // HACK for CORE-9224 Address = MmGetPhysicalAddress(TransferBuffer); // Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:05:13 2017 @@ -14,6 +14,7 @@ /branches/ros-amd64-bringup/drivers/usb/usbohci:36852 /branches/ros-amd64-bringup/reactos/drivers/usb/usbehci_new:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-amd64-bringup/reactos/drivers/usb/usbohci:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_4_4/reactos/drivers/usb/usbohci:73627-73628,73631 /branches/shell32_new-bringup/drivers/usb/usbohci:51893-53652,53661,53700 /branches/tcp-rewrite-branch/drivers/usb/usbohci:48720,48840-48841,49424-49426,49454 /branches/usb-bringup/drivers/usb/usbohci:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-51850,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -771,6 +771,7 @@ // // get physical page // + *(volatile char *)Buffer; // HACK for CORE-9224 Page = MmGetPhysicalAddress(Buffer).LowPart; // Modified: branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -17,7 +17,7 @@ #include "asmxtras.inc" #include <isvbop.inc> -// #define NDEBUG +#define NDEBUG /* DEFINES ********************************************************************/ Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -30,99 +30,22 @@ return STATUS_SUCCESS; } - -PGRAPHICS_DEVICE -NTAPI -EngpRegisterGraphicsDevice( - _In_ PUNICODE_STRING pustrDeviceName, - _In_ PUNICODE_STRING pustrDiplayDrivers, - _In_ PUNICODE_STRING pustrDescription, +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, _In_ PDEVMODEW pdmDefault) { - PGRAPHICS_DEVICE pGraphicsDevice; - PDEVICE_OBJECT pDeviceObject; - PFILE_OBJECT pFileObject; - NTSTATUS Status; PWSTR pwsz; - ULONG i, cj, cModes = 0; - SIZE_T cjWritten; - BOOL bEnable = TRUE; + PLDEVOBJ pldev; PDEVMODEINFO pdminfo; PDEVMODEW pdm, pdmEnd; - PLDEVOBJ pldev; + ULONG i, cModes = 0; BOOLEAN bModeMatch = FALSE; - TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); - - /* Allocate a GRAPHICS_DEVICE structure */ - pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, - sizeof(GRAPHICS_DEVICE), - GDITAG_GDEVICE); - if (!pGraphicsDevice) - { - ERR("ExAllocatePoolWithTag failed\n"); - return NULL; - } - - /* Try to open the driver */ - Status = IoGetDeviceObjectPointer(pustrDeviceName, - FILE_READ_DATA | FILE_WRITE_DATA, - &pFileObject, - &pDeviceObject); - if (!NT_SUCCESS(Status)) - { - ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Enable the device */ - EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); - - /* Copy the device and file object pointers */ - pGraphicsDevice->DeviceObject = pDeviceObject; - pGraphicsDevice->FileObject = pFileObject; - - /* Copy device name */ - RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, - sizeof(pGraphicsDevice->szNtDeviceName), - pustrDeviceName->Buffer, - pustrDeviceName->Length); - - /* Create a win device name (FIXME: virtual devices!) */ - swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); - - /* Allocate a buffer for the strings */ - cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); - pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); - if (!pwsz) - { - ERR("Could not allocate string buffer\n"); - ASSERT(FALSE); // FIXME - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Copy display driver names */ - pGraphicsDevice->pDiplayDrivers = pwsz; - RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, - pustrDiplayDrivers->Buffer, - pustrDiplayDrivers->Length); - - /* Copy description */ - pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); - RtlCopyMemory(pGraphicsDevice->pwszDescription, - pustrDescription->Buffer, - pustrDescription->Length); - pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; - - /* Initialize the pdevmodeInfo list and default index */ - pGraphicsDevice->pdevmodeInfo = NULL; - pGraphicsDevice->iDefaultMode = 0; - pGraphicsDevice->iCurrentMode = 0; - - // FIXME: initialize state flags - pGraphicsDevice->StateFlags = 0; + ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); + ASSERT(pGraphicsDevice->pDevModeList == NULL); + + pwsz = pGraphicsDevice->pDiplayDrivers; /* Loop through the driver names * This is a REG_MULTI_SZ string */ @@ -138,7 +61,7 @@ } /* Get the mode list from the driver */ - pdminfo = LDEVOBJ_pdmiGetModes(pldev, pDeviceObject); + pdminfo = LDEVOBJ_pdmiGetModes(pldev, pGraphicsDevice->DeviceObject); if (!pdminfo) { ERR("Could not get mode list for '%ls'\n", pwsz); @@ -170,8 +93,7 @@ if (!pGraphicsDevice->pdevmodeInfo || cModes == 0) { ERR("No devmodes\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } /* Allocate an index buffer */ @@ -182,8 +104,7 @@ if (!pGraphicsDevice->pDevModeList) { ERR("No devmode list\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n", @@ -232,7 +153,106 @@ pGraphicsDevice->pDevModeList[i].pdm = pdm; i++; } - } + } + return TRUE; +} + +PGRAPHICS_DEVICE +NTAPI +EngpRegisterGraphicsDevice( + _In_ PUNICODE_STRING pustrDeviceName, + _In_ PUNICODE_STRING pustrDiplayDrivers, + _In_ PUNICODE_STRING pustrDescription, + _In_ PDEVMODEW pdmDefault) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVICE_OBJECT pDeviceObject; + PFILE_OBJECT pFileObject; + NTSTATUS Status; + PWSTR pwsz; + ULONG cj; + SIZE_T cjWritten; + BOOL bEnable = TRUE; + + TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); + + /* Allocate a GRAPHICS_DEVICE structure */ + pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, + sizeof(GRAPHICS_DEVICE), + GDITAG_GDEVICE); + if (!pGraphicsDevice) + { + ERR("ExAllocatePoolWithTag failed\n"); + return NULL; + } + + /* Try to open the driver */ + Status = IoGetDeviceObjectPointer(pustrDeviceName, + FILE_READ_DATA | FILE_WRITE_DATA, + &pFileObject, + &pDeviceObject); + if (!NT_SUCCESS(Status)) + { + ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Enable the device */ + EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); + + /* Copy the device and file object pointers */ + pGraphicsDevice->DeviceObject = pDeviceObject; + pGraphicsDevice->FileObject = pFileObject; + + /* Copy device name */ + RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, + sizeof(pGraphicsDevice->szNtDeviceName), + pustrDeviceName->Buffer, + pustrDeviceName->Length); + + /* Create a win device name (FIXME: virtual devices!) */ + swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); + + /* Allocate a buffer for the strings */ + cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); + pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); + if (!pwsz) + { + ERR("Could not allocate string buffer\n"); + ASSERT(FALSE); // FIXME + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Copy display driver names */ + pGraphicsDevice->pDiplayDrivers = pwsz; + RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, + pustrDiplayDrivers->Buffer, + pustrDiplayDrivers->Length); + + /* Copy description */ + pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); + RtlCopyMemory(pGraphicsDevice->pwszDescription, + pustrDescription->Buffer, + pustrDescription->Length); + pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; + + /* Initialize the pdevmodeInfo list and default index */ + pGraphicsDevice->pdevmodeInfo = NULL; + pGraphicsDevice->iDefaultMode = 0; + pGraphicsDevice->iCurrentMode = 0; + + // FIXME: initialize state flags + pGraphicsDevice->StateFlags = 0; + + /* Create the mode list */ + pGraphicsDevice->pDevModeList = NULL; + if (!EngpPopulateDeviceModeList(pGraphicsDevice, pdmDefault)) + { + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } /* Lock loader */ EngAcquireSemaphore(ghsemGraphicsDeviceList); @@ -250,7 +270,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - TRACE("Prepared %lu modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + TRACE("Prepared %lu modes for %ls\n", pGraphicsDevice->cDevModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -2,6 +2,11 @@ #pragma once #define TAG_GDEV 'gdev' + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev); extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; @@ -29,6 +34,11 @@ _In_ PUNICODE_STRING pustrDescription, _In_ PDEVMODEW pdmDefault); +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW pdmDefault); + INIT_FUNCTION NTSTATUS NTAPI Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -249,6 +249,45 @@ DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); return ppdev->pSurface; +} + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVMODEINFO pdminfo, pdmiNext; + DEVMODEW dmDefault; + + /* Lock the PDEV */ + EngAcquireSemaphore(ppdev->hsemDevLock); + + pGraphicsDevice = ppdev->pGraphicsDevice; + + /* Remember our default mode */ + dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; + + /* Clear out the modes */ + for (pdminfo = pGraphicsDevice->pdevmodeInfo; + pdminfo; + pdminfo = pdmiNext) + { + pdmiNext = pdminfo->pdmiNext; + ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); + } + pGraphicsDevice->pdevmodeInfo = NULL; + ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE); + pGraphicsDevice->pDevModeList = NULL; + + /* Now re-populate the list */ + if (!EngpPopulateDeviceModeList(pGraphicsDevice, &dmDefault)) + { + DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n"); + } + + /* Unlock PDEV */ + EngReleaseSemaphore(ppdev->hsemDevLock); } PDEVMODEW Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -463,19 +463,27 @@ PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; + PPDEVOBJ ppdev; TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); - - if (!pGraphicsDevice) + ppdev = EngpGetPDEV(pustrDevice); + + if (!pGraphicsDevice || !ppdev) { /* No device found */ ERR("No device found!\n"); return STATUS_INVALID_PARAMETER_1; } + + /* let's politely ask the driver for an updated mode list, + just in case there's something new in there (vbox) */ + + PDEVOBJ_vRefreshModeList(ppdev); + PDEVOBJ_vRelease(ppdev); iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++) Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -1464,20 +1464,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1518,20 +1513,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1611,20 +1601,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1672,20 +1657,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs