Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[gadamopoulos] 58786: [msgina] - Promote some debug messages to errors in order to understand why trying to open the task manager from the loged on dialog sometimes fails

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Apr 19 09:59:50 2013 New Revision: 58786 URL: http://svn.reactos.org/svn/reactos?rev=58786&view=rev Log: [msgina] - Promote some debug messages to errors in order to understand why trying to open the task manager from the loged on dialog sometimes fails Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Fri Apr 19 09:59:50 2013 @@ -268,14 +268,14 @@ len = GetWindowsDirectoryW(CurrentDirectory, MAX_PATH); if (len == 0 || len > MAX_PATH) { - WARN("GetWindowsDirectoryW() failed\n"); + ERR("GetWindowsDirectoryW() failed\n"); return FALSE; } ret = DuplicateTokenEx(pgContext->UserToken, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenPrimary, &hAppToken); if (!ret) { - WARN("DuplicateTokenEx() failed with error %lu\n", GetLastError()); + ERR("DuplicateTokenEx() failed with error %lu\n", GetLastError()); return FALSE; } @@ -290,7 +290,7 @@ len = GetWindowsDirectoryW(CurrentDirectory, MAX_PATH); if (len == 0 || len > MAX_PATH) { - WARN("GetWindowsDirectoryW() failed\n"); + ERR("GetWindowsDirectoryW() failed\n"); return FALSE; } ret = CreateProcessAsUserW( @@ -309,7 +309,7 @@ CloseHandle(ProcessInformation.hThread); CloseHandle(hAppToken); if (!ret) - WARN("CreateProcessAsUserW() failed with error %lu\n", GetLastError()); + ERR("CreateProcessAsUserW() failed with error %lu\n", GetLastError()); return ret; }

11 years, 8 months

[gadamopoulos] 58785: [msgina] - Switch to the winlogon desktop when we show the LogedOn dialog

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Apr 19 08:12:10 2013 New Revision: 58785 URL: http://svn.reactos.org/svn/reactos?rev=58785&view=rev Log: [msgina] - Switch to the winlogon desktop when we show the LogedOn dialog Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Fri Apr 19 08:12:10 2013 @@ -322,6 +322,9 @@ return WLX_SAS_ACTION_NONE; } + result = pgContext->pWlxFuncs->WlxSwitchDesktopToWinlogon( + pgContext->hWlx); + result = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, @@ -329,12 +332,20 @@ GetDesktopWindow(), LoggedOnWindowProc, (LPARAM)pgContext); - if (result >= WLX_SAS_ACTION_LOGON && - result <= WLX_SAS_ACTION_SWITCH_CONSOLE) - { - return result; - } - return WLX_SAS_ACTION_NONE; + + if (result < WLX_SAS_ACTION_LOGON || + result > WLX_SAS_ACTION_SWITCH_CONSOLE) + { + result = WLX_SAS_ACTION_NONE; + } + + if (result == WLX_SAS_ACTION_NONE) + { + result = pgContext->pWlxFuncs->WlxSwitchDesktopToUser( + pgContext->hWlx); + } + + return result; } static INT_PTR CALLBACK

11 years, 8 months

[hbelusca] 58784: [PSDK] Fix some declarations (checked against Windows PSDK and Arwinss, which showed me the Truth :P).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 18 22:13:50 2013 New Revision: 58784 URL: http://svn.reactos.org/svn/reactos?rev=58784&view=rev Log: [PSDK] Fix some declarations (checked against Windows PSDK and Arwinss, which showed me the Truth :P). Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Thu Apr 18 22:13:50 2013 @@ -2825,8 +2825,8 @@ typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM); typedef BOOL(CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE); typedef BOOL(CALLBACK *PROPENUMPROCW)(HWND,LPCWSTR,HANDLE); -typedef BOOL(CALLBACK *PROPENUMPROCEXA)(HWND,LPSTR,HANDLE,DWORD); -typedef BOOL(CALLBACK *PROPENUMPROCEXW)(HWND,LPWSTR,HANDLE,DWORD); +typedef BOOL(CALLBACK *PROPENUMPROCEXA)(HWND,LPSTR,HANDLE,ULONG_PTR); +typedef BOOL(CALLBACK *PROPENUMPROCEXW)(HWND,LPWSTR,HANDLE,ULONG_PTR); typedef int(CALLBACK *EDITWORDBREAKPROCA)(LPSTR,int,int,int); typedef int(CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,int,int,int); typedef LRESULT(CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM); @@ -2839,7 +2839,7 @@ typedef NAMEENUMPROCW DESKTOPENUMPROCW; typedef NAMEENUMPROCA WINSTAENUMPROCA; typedef NAMEENUMPROCW WINSTAENUMPROCW; -typedef void(CALLBACK *SENDASYNCPROC)(HWND,UINT,DWORD,LRESULT); +typedef void(CALLBACK *SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT); DECLARE_HANDLE(HHOOK); DECLARE_HANDLE(HDWP); DECLARE_HANDLE(HDEVNOTIFY);

11 years, 8 months

[akhaldi] 58783: [IEFRAME] * Import from Wine 1.5.26. [PSDK] * Import docobjectservice.idl and htiface.idl from Wine. * Add some missing definitions in shlobj.h. [UUID] * Add docobjectservice.idl a...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 18 21:46:58 2013 New Revision: 58783 URL: http://svn.reactos.org/svn/reactos?rev=58783&view=rev Log: [IEFRAME] * Import from Wine 1.5.26. [PSDK] * Import docobjectservice.idl and htiface.idl from Wine. * Add some missing definitions in shlobj.h. [UUID] * Add docobjectservice.idl and htiface.idl to the list. * Add CGID_DocHostCommandHandler. Added: trunk/reactos/dll/win32/ieframe/ (with props) trunk/reactos/dll/win32/ieframe/CMakeLists.txt (with props) trunk/reactos/dll/win32/ieframe/classinfo.c (with props) trunk/reactos/dll/win32/ieframe/client.c (with props) trunk/reactos/dll/win32/ieframe/dochost.c (with props) trunk/reactos/dll/win32/ieframe/events.c (with props) trunk/reactos/dll/win32/ieframe/frame.c (with props) trunk/reactos/dll/win32/ieframe/ie.c (with props) trunk/reactos/dll/win32/ieframe/ieframe.h (with props) trunk/reactos/dll/win32/ieframe/ieframe.rc (with props) trunk/reactos/dll/win32/ieframe/ieframe.rgs (with props) trunk/reactos/dll/win32/ieframe/ieframe.spec (with props) trunk/reactos/dll/win32/ieframe/ieframe_main.c (with props) trunk/reactos/dll/win32/ieframe/ieframe_v1.idl (with props) trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs (with props) trunk/reactos/dll/win32/ieframe/iehtmlwnd.c (with props) trunk/reactos/dll/win32/ieframe/ietoolbar.bmp (with props) trunk/reactos/dll/win32/ieframe/iexplore.c (with props) trunk/reactos/dll/win32/ieframe/intshcut.c (with props) trunk/reactos/dll/win32/ieframe/navigate.c (with props) trunk/reactos/dll/win32/ieframe/oleobject.c (with props) trunk/reactos/dll/win32/ieframe/persist.c (with props) trunk/reactos/dll/win32/ieframe/resource.h (with props) trunk/reactos/dll/win32/ieframe/shellbrowser.c (with props) trunk/reactos/dll/win32/ieframe/shelluihelper.c (with props) trunk/reactos/dll/win32/ieframe/urlhist.c (with props) trunk/reactos/dll/win32/ieframe/view.c (with props) trunk/reactos/dll/win32/ieframe/webbrowser.c (with props) trunk/reactos/include/psdk/docobjectservice.idl (with props) trunk/reactos/include/psdk/htiface.idl (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/include/psdk/shlobj.h trunk/reactos/lib/sdk/uuid/CMakeLists.txt trunk/reactos/lib/sdk/uuid/ieguids.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Added: trunk/reactos/dll/win32/ieframe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/CMakeLis… Added: trunk/reactos/dll/win32/ieframe/classinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/classinf… Added: trunk/reactos/dll/win32/ieframe/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/client.c… Added: trunk/reactos/dll/win32/ieframe/dochost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/dochost.… Added: trunk/reactos/dll/win32/ieframe/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/events.c… Added: trunk/reactos/dll/win32/ieframe/frame.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/frame.c?… Added: trunk/reactos/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev… Added: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… Added: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… Added: trunk/reactos/dll/win32/ieframe/ieframe.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… Added: trunk/reactos/dll/win32/ieframe/ieframe.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… Added: trunk/reactos/dll/win32/ieframe/ieframe_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… Added: trunk/reactos/dll/win32/ieframe/ieframe_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… Added: trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… Added: trunk/reactos/dll/win32/ieframe/iehtmlwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iehtmlwn… Added: trunk/reactos/dll/win32/ieframe/ietoolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ietoolba… Added: trunk/reactos/dll/win32/ieframe/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iexplore… Added: trunk/reactos/dll/win32/ieframe/intshcut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/intshcut… Added: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate… Added: trunk/reactos/dll/win32/ieframe/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/oleobjec… Added: trunk/reactos/dll/win32/ieframe/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/persist.… Added: trunk/reactos/dll/win32/ieframe/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/resource… Added: trunk/reactos/dll/win32/ieframe/shellbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shellbro… Added: trunk/reactos/dll/win32/ieframe/shelluihelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shelluih… Added: trunk/reactos/dll/win32/ieframe/urlhist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/urlhist.… Added: trunk/reactos/dll/win32/ieframe/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/view.c?r… Added: trunk/reactos/dll/win32/ieframe/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/webbrows… Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… Added: trunk/reactos/include/psdk/docobjectservice.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/docobjectserv… Added: trunk/reactos/include/psdk/htiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/htiface.idl?r… Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… Modified: trunk/reactos/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/CMakeLists.tx… Modified: trunk/reactos/lib/sdk/uuid/ieguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/ieguids.c?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 8 months

[hbelusca] 58782: [CMAKE-scripts] Indentation fixes, no code changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 18 21:19:09 2013 New Revision: 58782 URL: http://svn.reactos.org/svn/reactos?rev=58782&view=rev Log: [CMAKE-scripts] Indentation fixes, no code changes. Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/config-amd64.cmake trunk/reactos/cmake/config-arm.cmake trunk/reactos/cmake/config.cmake trunk/reactos/cmake/midl-support.cmake trunk/reactos/cmake/widl-support.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Thu Apr 18 21:19:09 2013 @@ -54,26 +54,26 @@ endfunction() function(add_link) - cmake_parse_arguments(_LINK "MINIMIZE" "NAME;PATH;CMD_LINE_ARGS;ICON;GUID" "" ${ARGN}) + cmake_parse_arguments(_LINK "MINIMIZE" "NAME;PATH;CMD_LINE_ARGS;ICON;GUID" "" ${ARGN}) if(NOT _LINK_NAME OR NOT _LINK_PATH) message(FATAL_ERROR "You must provide name and path") endif() - if(_LINK_CMD_LINE_ARGS) - set(_LINK_CMD_LINE_ARGS -c ${_LINK_CMD_LINE_ARGS}) - endif() - - if(_LINK_ICON) - set(_LINK_ICON -i ${_LINK_ICON}) - endif() - - if(_LINK_GUID) - set(_LINK_GUID -g ${_LINK_GUID}) - endif() - - if(_LINK_MINIMIZE) - set(_LINK_MINIMIZE "-m") - endif() + if(_LINK_CMD_LINE_ARGS) + set(_LINK_CMD_LINE_ARGS -c ${_LINK_CMD_LINE_ARGS}) + endif() + + if(_LINK_ICON) + set(_LINK_ICON -i ${_LINK_ICON}) + endif() + + if(_LINK_GUID) + set(_LINK_GUID -g ${_LINK_GUID}) + endif() + + if(_LINK_MINIMIZE) + set(_LINK_MINIMIZE "-m") + endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk Modified: trunk/reactos/cmake/config-amd64.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-amd64.cmake?r… ============================================================================== --- trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] Thu Apr 18 21:19:09 2013 @@ -28,7 +28,7 @@ set(GDB FALSE CACHE BOOL "Whether to compile for debugging with GDB. -If you don't use GDB, don't enable this.") +If you don't use GDB, don't enable this.") set(_WINKD_ TRUE CACHE BOOL "Whether to compile with the KD protocol.") Modified: trunk/reactos/cmake/config-arm.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-arm.cmake?rev… ============================================================================== --- trunk/reactos/cmake/config-arm.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-arm.cmake [iso-8859-1] Thu Apr 18 21:19:09 2013 @@ -29,7 +29,7 @@ set(GDB FALSE CACHE BOOL "Whether to compile for debugging with GDB. -If you don't use GDB, don't enable this.") +If you don't use GDB, don't enable this.") set(_WINKD_ TRUE CACHE BOOL "Whether to compile with the KD protocol.") Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=587… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Thu Apr 18 21:19:09 2013 @@ -26,7 +26,7 @@ set(GDB FALSE CACHE BOOL "Whether to compile for debugging with GDB. -If you don't use GDB, don't enable this.") +If you don't use GDB, don't enable this.") if(CMAKE_BUILD_TYPE STREQUAL "Release") set(DBG FALSE CACHE BOOL Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Apr 18 21:19:09 2013 @@ -107,7 +107,7 @@ add_library(${_target} ${_iid_sources}) # for wtypes.h - add_dependencies(${_target} psdk) + add_dependencies(${_target} psdk) set_target_properties(${_target} PROPERTIES EXCLUDE_FROM_ALL TRUE) endfunction() Modified: trunk/reactos/cmake/widl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/widl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/widl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/widl-support.cmake [iso-8859-1] Thu Apr 18 21:19:09 2013 @@ -108,7 +108,7 @@ list(APPEND IID_SOURCES ${NAME}_i.c) endforeach() add_library(${TARGET} ${IID_SOURCES}) - add_dependencies(${TARGET} psdk) + add_dependencies(${TARGET} psdk) set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) endfunction()

11 years, 8 months

[gadamopoulos] 58781: [winlogon] - Remove the big hack that made winlogon use only one desktop

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Apr 18 18:03:52 2013 New Revision: 58781 URL: http://svn.reactos.org/svn/reactos?rev=58781&view=rev Log: [winlogon] - Remove the big hack that made winlogon use only one desktop Modified: trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Thu Apr 18 18:03:52 2013 @@ -1125,12 +1125,6 @@ goto cleanup; } - /* FIXME: big HACK */ - CloseDesktop(Session->WinlogonDesktop); - CloseDesktop(Session->ScreenSaverDesktop); - Session->WinlogonDesktop = OpenDesktopW(L"Default", 0, FALSE, GENERIC_ALL); - Session->ScreenSaverDesktop = OpenDesktopW(L"Default", 0, FALSE, GENERIC_ALL); - /* * Switch to winlogon desktop */

11 years, 8 months

[gadamopoulos] 58780: [win32k] - When creating a new window, create it in the thread desktop and not in the active desktop

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Apr 18 17:54:39 2013 New Revision: 58780 URL: http://svn.reactos.org/svn/reactos?rev=58780&view=rev Log: [win32k] - When creating a new window, create it in the thread desktop and not in the active desktop Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Apr 18 17:54:39 2013 @@ -2022,12 +2022,12 @@ } /* Now find the parent and the owner window */ - hWndParent = IntGetDesktopWindow(); + hWndParent = pti->rpdesk->pDeskInfo->spwnd->head.h; hWndOwner = NULL; if (Cs->hwndParent == HWND_MESSAGE) { - Cs->hwndParent = hWndParent = IntGetMessageWindow(); + Cs->hwndParent = hWndParent = pti->rpdesk->spwndMessage->head.h; } else if (Cs->hwndParent) {

11 years, 8 months

[gadamopoulos] 58779: [thmsvc] - Fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Apr 18 17:22:52 2013 New Revision: 58779 URL: http://svn.reactos.org/svn/reactos?rev=58779&view=rev Log: [thmsvc] - Fix build Modified: trunk/reactos/base/services/thmsvc/thmsvc.c Modified: trunk/reactos/base/services/thmsvc/thmsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/thmsvc/thmsv… ============================================================================== --- trunk/reactos/base/services/thmsvc/thmsvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/thmsvc/thmsvc.c [iso-8859-1] Thu Apr 18 17:22:52 2013 @@ -8,8 +8,8 @@ /* INCLUDES *****************************************************************/ -#include <windef.h> -#include <winsvc.h> +#include <windows.h> +#include <uxtheme.h> #include <uxundoc.h> #include <wine/debug.h>

11 years, 8 months

[gadamopoulos] 58778: [uxtheme] - Stub OpenThemeDataFromFile and DrawNCPreview that will be used by desk.cpl in the future

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Apr 18 17:09:20 2013 New Revision: 58778 URL: http://svn.reactos.org/svn/reactos?rev=58778&view=rev Log: [uxtheme] - Stub OpenThemeDataFromFile and DrawNCPreview that will be used by desk.cpl in the future Modified: trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxtheme.spec trunk/reactos/include/reactos/uxundoc.h Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Thu Apr 18 17:09:20 2013 @@ -657,6 +657,11 @@ return hTheme; } +HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, HWND hwnd, LPCWSTR pszClassList, DWORD flags) +{ + return S_OK; +} + /*********************************************************************** * OpenThemeData (UXTHEME.@) */ @@ -1214,3 +1219,16 @@ MSSTYLES_CloseThemeFile(pt); return S_OK; } + +HRESULT WINAPI DrawNCPreview(HDC hDC, + DWORD DNCP_Flag, + LPRECT prcPreview, + LPCWSTR pszThemeFileName, + LPCWSTR pszColorName, + LPCWSTR pszSizeName, + PNONCLIENTMETRICSW pncMetrics, + COLORREF* lpaRgbValues) +{ + return S_OK; +} + Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Thu Apr 18 17:09:20 2013 @@ -8,10 +8,10 @@ 9 stdcall -noname EnumThemeColors(wstr wstr long ptr) 10 stdcall -noname EnumThemeSizes(wstr wstr long ptr) 11 stdcall -noname ParseThemeIniFile(wstr wstr ptr ptr) -13 stub -noname DrawNCPreview +13 stdcall -noname DrawNCPreview(ptr long ptr wstr wstr wstr ptr ptr) 14 stub -noname RegisterDefaultTheme 15 stub -noname DumpLoadedThemeToTextFile -16 stub -noname OpenThemeDataFromFile +16 stdcall -noname OpenThemeDataFromFile(ptr ptr wstr long) 17 stub -noname OpenThemeFileFromData 18 stub -noname GetThemeSysSize96 19 stub -noname GetThemeSysFont96 Modified: trunk/reactos/include/reactos/uxundoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/uxundoc.h?… ============================================================================== --- trunk/reactos/include/reactos/uxundoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/uxundoc.h [iso-8859-1] Thu Apr 18 17:09:20 2013 @@ -56,23 +56,65 @@ /* Declarations for undocumented functions for use internally */ DWORD WINAPI QueryThemeServices(void); -HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, - LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, + +HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, + LPCWSTR pszColorName, + LPCWSTR pszSizeName, + HTHEMEFILE *hThemeFile, DWORD unknown); + HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile); -HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd); -HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, - DWORD dwColorNameLen, LPWSTR pszSizeName, + +HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, + char *unknown, + HWND hWnd); + +HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, + LPWSTR pszColorName, + DWORD dwColorNameLen, + LPWSTR pszSizeName, DWORD dwSizeNameLen); -HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, ENUMTHEMEPROC callback, + +HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, + ENUMTHEMEPROC callback, LPVOID lpData); -HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, - DWORD dwColorNum, PTHEMENAMES pszColorNames); -HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, - DWORD dwSizeNum, PTHEMENAMES pszColorNames); -HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, - PARSETHEMEINIFILEPROC callback, LPVOID lpData); + +HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, + LPWSTR pszSizeName, + DWORD dwColorNum, + PTHEMENAMES pszColorNames); + +HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, + LPWSTR pszColorName, + DWORD dwSizeNum, + PTHEMENAMES pszColorNames); + +HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, + LPWSTR pszUnknown, + PARSETHEMEINIFILEPROC callback, + LPVOID lpData); + +HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, + HWND hwnd, + LPCWSTR pszClassList, + DWORD flags); + +/* The DNCP_* flags let the caller decide what should be painted */ +#define DNCP_ACTIVEWINDOW 0x1 +#define DNCP_INACTIVEWINDOW 0x2 +#define DNCP_DIALOGWINDOW 0x4 +#define DNCP_DRAW_ALL DNCP_ACTIVEWINDOW | DNCP_INACTIVEWINDOW | DNCP_DIALOGWINDOW + +HRESULT WINAPI DrawNCPreview(HDC hDC, + DWORD DNCP_Flag, + LPRECT prcPreview, + LPCWSTR pszThemeFileName, + LPCWSTR pszColorName, + LPCWSTR pszSizeName, + PNONCLIENTMETRICSW pncMetrics, + COLORREF* lpaRgbValues); BOOL WINAPI ThemeHooksInstall(); + BOOL WINAPI ThemeHooksRemove();

11 years, 8 months

[spetreolle] 58777: [HIVESFT] Fix RunOnce for iexplore. iexplore is now correctly moved into %ProgramFiles%\Internet Explorer.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Apr 18 12:14:47 2013 New Revision: 58777 URL: http://svn.reactos.org/svn/reactos?rev=58777&view=rev Log: [HIVESFT] Fix RunOnce for iexplore. iexplore is now correctly moved into %ProgramFiles%\Internet Explorer. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu Apr 18 12:14:47 2013 @@ -104,7 +104,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions",,0x00000012 ; FIXME - usetup doesn't handle extra paths -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\system32\iexplore.exe ""%programfiles%\Internet Explorer\""" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\""" ; Create .NET Framework InstallRoot key, reg_sz & full path ;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\"

11 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013