Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[hbelusca] 65515: [USER32]: Move some logon-related functions to an appropriate file.
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 20:58:50 2014 New Revision: 65515 URL: http://svn.reactos.org/svn/reactos?rev=65515&view=rev Log: [USER32]: Move some logon-related functions to an appropriate file. Added: trunk/reactos/win32ss/user/user32/misc/logon.c (with props) Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/user32/misc/misc.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Fri Nov 28 20:58:50 2014 @@ -25,6 +25,7 @@ misc/exit.c misc/exticon.c misc/imm.c + misc/logon.c misc/misc.c misc/object.c misc/resources.c Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Fri Nov 28 20:58:50 2014 @@ -40,7 +40,7 @@ * - This ends the processing for the first ExitWindowsEx() call from WinLogon. * Execution continues in WinLogon, which calls ExitWindowsEx() again to * terminate COM processes in the interactive user's session. - * - WinLogon stops impersonating the interactive user (whos processes are + * - WinLogon stops impersonating the interactive user (whose processes are * all dead by now). and enters log-out state * - If the ExitWindowsEx() request was for a logoff, WinLogon sends a SAS * event (to display the "press ctrl+alt+del") to the GINA. WinLogon then @@ -86,29 +86,4 @@ return TRUE; } - -/* - * @implemented - */ -BOOL WINAPI -RegisterServicesProcess(DWORD ServicesProcessId) -{ - NTSTATUS Status; - USER_API_MESSAGE ApiMessage; - - ApiMessage.Data.RegisterServicesProcessRequest.ProcessId = ServicesProcessId; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterServicesProcess), - sizeof(USER_REGISTER_SERVICES_PROCESS)); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - /* EOF */ Added: trunk/reactos/win32ss/user/user32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/l… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/logon.c (added) +++ trunk/reactos/win32ss/user/user32/misc/logon.c [iso-8859-1] Fri Nov 28 20:58:50 2014 @@ -0,0 +1,95 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS user32.dll + * FILE: lib/user32/misc/logon.c + * PURPOSE: Logon functions + * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <user32.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(user32); + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +BOOL +WINAPI +RegisterServicesProcess(DWORD ServicesProcessId) +{ + USER_API_MESSAGE ApiMessage; + PUSER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest = &ApiMessage.Data.RegisterServicesProcessRequest; + + RegisterServicesProcessRequest->ProcessId = ServicesProcessId; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterServicesProcess), + sizeof(*RegisterServicesProcessRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + UserSetLastNTError(ApiMessage.Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +RegisterLogonProcess(DWORD dwProcessId, + BOOL bRegister) +{ + gfLogonProcess = NtUserxRegisterLogonProcess(dwProcessId, bRegister); + + if (gfLogonProcess) + { + USER_API_MESSAGE ApiMessage; + PUSER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest = &ApiMessage.Data.RegisterLogonProcessRequest; + + RegisterLogonProcessRequest->ProcessId = dwProcessId; + RegisterLogonProcessRequest->Register = bRegister; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess), + sizeof(*RegisterLogonProcessRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + ERR("Failed to register logon process with CSRSS\n"); + UserSetLastNTError(ApiMessage.Status); + } + } + + return gfLogonProcess; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta) +{ + return NtUserSetLogonNotifyWindow(Wnd); +} + +/* + * @implemented + */ +BOOL +WINAPI +UpdatePerUserSystemParameters(DWORD dwReserved, + BOOL bEnable) +{ + return NtUserUpdatePerUserSystemParameters(dwReserved, bEnable); +} Propchange: trunk/reactos/win32ss/user/user32/misc/logon.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Fri Nov 28 20:58:50 2014 @@ -39,59 +39,6 @@ UserSetLastError(RtlNtStatusToDosError(Status)); } - -/* - * @implemented - */ -BOOL -WINAPI -RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister) -{ - gfLogonProcess = NtUserxRegisterLogonProcess(dwProcessId, bRegister); - - if (gfLogonProcess) - { - NTSTATUS Status; - USER_API_MESSAGE ApiMessage; - - ApiMessage.Data.RegisterLogonProcessRequest.ProcessId = dwProcessId; - ApiMessage.Data.RegisterLogonProcessRequest.Register = bRegister; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess), - sizeof(USER_REGISTER_LOGON_PROCESS)); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to register logon process with CSRSS\n"); - SetLastError(RtlNtStatusToDosError(Status)); - // return FALSE; - } - } - - return gfLogonProcess; -} - -/* - * @implemented - */ -BOOL -WINAPI -SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta) -{ - return NtUserSetLogonNotifyWindow(Wnd); -} - -/* - * @implemented - */ -BOOL WINAPI -UpdatePerUserSystemParameters( - DWORD dwReserved, - BOOL bEnable) -{ - return NtUserUpdatePerUserSystemParameters(dwReserved, bEnable); -} PTHREADINFO GetW32ThreadInfo(VOID)

1 0

[jimtabor] 65514: [NtUser] - Revert 65431, it seems to be breaking more than it fixes. Process Explorer will break again, working on a better way to fix this. See CORE-7447.
by jimtabor＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: jimtabor Date: Fri Nov 28 20:44:04 2014 New Revision: 65514 URL: http://svn.reactos.org/svn/reactos?rev=65514&view=rev Log: [NtUser] - Revert 65431, it seems to be breaking more than it fixes. Process Explorer will break again, working on a better way to fix this. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Fri Nov 28 20:44:04 2014 @@ -500,11 +500,6 @@ return Status; } } - if (KernelModeMsg->message == WM_COPYDATA) - { - // Only the current process or thread can free the message lParam pointer. - return STATUS_SUCCESS; - } ExFreePool((PVOID) KernelModeMsg->lParam); } @@ -1417,11 +1412,6 @@ CLEANUP: if (Window) UserDerefObjectCo(Window); - // Current Thread and it's a Copy Data message, then free kernel memory. - if ( !ptiSendTo && Msg == WM_COPYDATA ) - { - ExFreePool((PVOID) lParam); - } END_CLEANUP; }

1 0

[hbelusca] 65513: [USER32] - Call GetThreadConsoleDesktop of CONSRV if needed, in GetThreadDesktop (in case the process is a console app). - Introduce two last-error helpers UserSetLast(NT)Error wh...
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 20:34:16 2014 New Revision: 65513 URL: http://svn.reactos.org/svn/reactos?rev=65513&view=rev Log: [USER32] - Call GetThreadConsoleDesktop of CONSRV if needed, in GetThreadDesktop (in case the process is a console app). - Introduce two last-error helpers UserSetLast(NT)Error which work the same as the (Base)SetLast(NT)Error of kernel32, needed for CSR status errors etc... [WINSRV] - Improve the stub of SrvGetThreadConsoleDesktop (it needs to success, and atm. it always zeroes-out the returned console desktop handle). Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/misc/desktop.c trunk/reactos/win32ss/user/user32/misc/misc.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] Fri Nov 28 20:34:16 2014 @@ -36,18 +36,24 @@ } USERSRV_API_NUMBER, *PUSERSRV_API_NUMBER; -typedef struct +typedef struct _USER_EXIT_REACTOS { UINT Flags; DWORD Reserved; } USER_EXIT_REACTOS, *PUSER_EXIT_REACTOS; -typedef struct +typedef struct _USER_GET_THREAD_CONSOLE_DESKTOP +{ + ULONG_PTR ThreadId; + HANDLE ConsoleDesktop; +} USER_GET_THREAD_CONSOLE_DESKTOP, *PUSER_GET_THREAD_CONSOLE_DESKTOP; + +typedef struct _USER_REGISTER_SERVICES_PROCESS { ULONG_PTR ProcessId; } USER_REGISTER_SERVICES_PROCESS, *PUSER_REGISTER_SERVICES_PROCESS; -typedef struct +typedef struct _USER_REGISTER_LOGON_PROCESS { ULONG_PTR ProcessId; BOOL Register; @@ -65,6 +71,7 @@ union { USER_EXIT_REACTOS ExitReactosRequest; + USER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest; USER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; USER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; } Data; Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Fri Nov 28 20:34:16 2014 @@ -68,6 +68,8 @@ VOID FASTCALL MessageCleanup(VOID); /* definitions for misc.c */ +VOID WINAPI UserSetLastError(IN DWORD dwErrCode); +VOID WINAPI UserSetLastNTError(IN NTSTATUS Status); PCALLPROCDATA FASTCALL ValidateCallProc(HANDLE hCallProc); PWND FASTCALL ValidateHwnd(HWND hwnd); PWND FASTCALL ValidateHwndOrDesk(HWND hwnd); Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] Fri Nov 28 20:34:16 2014 @@ -548,7 +548,23 @@ GetThreadDesktop( DWORD dwThreadId) { - return NtUserGetThreadDesktop(dwThreadId, 0); + USER_API_MESSAGE ApiMessage; + PUSER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest = &ApiMessage.Data.GetThreadConsoleDesktopRequest; + + GetThreadConsoleDesktopRequest->ThreadId = dwThreadId; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpGetThreadConsoleDesktop), + sizeof(*GetThreadConsoleDesktopRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + UserSetLastNTError(ApiMessage.Status); + return NULL; + } + + return NtUserGetThreadDesktop(dwThreadId, + (DWORD)GetThreadConsoleDesktopRequest->ConsoleDesktop); } Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Fri Nov 28 20:34:16 2014 @@ -1,28 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/misc.c * PURPOSE: Misc * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) - * UPDATE HISTORY: - * 19-11-2003 Created */ /* INCLUDES ******************************************************************/ @@ -34,6 +15,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); /* FUNCTIONS *****************************************************************/ + +VOID +WINAPI +UserSetLastError(IN DWORD dwErrCode) +{ + /* + * Equivalent of SetLastError in kernel32, but without breaking + * into the debugger nor checking whether the last old error is + * the same as the one we are going to set. + */ + NtCurrentTeb()->LastErrorValue = dwErrCode; +} + +VOID +WINAPI +UserSetLastNTError(IN NTSTATUS Status) +{ + /* + * Equivalent of BaseSetLastNTError in kernel32, but using + * UserSetLastError: convert from NT to Win32, then set. + */ + UserSetLastError(RtlNtStatusToDosError(Status)); +} + /* * @implemented Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Fri Nov 28 20:34:16 2014 @@ -121,8 +121,15 @@ CSR_API(SrvGetThreadConsoleDesktop) { + PUSER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.GetThreadConsoleDesktopRequest; + DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + + /* Return nothing for the moment... */ + GetThreadConsoleDesktopRequest->ConsoleDesktop = NULL; + + /* Always succeeds */ + return STATUS_SUCCESS; } CSR_API(SrvDeviceEvent)

1 0

[akhaldi] 65512: [KERNEL32_WINETEST] Addendum to r65511.
by akhaldi＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: akhaldi Date: Fri Nov 28 19:22:34 2014 New Revision: 65512 URL: http://svn.reactos.org/svn/reactos?rev=65512&view=rev Log: [KERNEL32_WINETEST] Addendum to r65511. Modified: trunk/rostests/winetests/kernel32/actctx.c Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… ============================================================================== --- trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] Fri Nov 28 19:22:34 2014 @@ -2167,6 +2167,65 @@ handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); + + /* load manifest from lpAssemblyDirectory directory */ + write_manifest("testdir.manifest", manifest1); + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + SetCurrentDirectoryA(path); + strcat(path, "assembly_dir"); + strcpy(dir, path); + strcat(path, "\\testdir.manifest"); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError()==ERROR_PATH_NOT_FOUND || + broken(GetLastError()==ERROR_FILE_NOT_FOUND) /* WinXP */, + "got error %d\n", GetLastError()); + + CreateDirectoryA(dir, NULL); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %d\n", GetLastError()); + SetCurrentDirectoryW(work_dir); + + write_manifest("assembly_dir\\testdir.manifest", manifest1); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = path; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + delete_manifest_file("testdir.manifest"); + delete_manifest_file("assembly_dir\\testdir.manifest"); + RemoveDirectoryA(dir); } static BOOL init_funcs(void)

1 0

[akhaldi] 65511: [RTL] Import Wine commit f87767b by Piotr Caban: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext.
by akhaldi＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: akhaldi Date: Fri Nov 28 19:20:39 2014 New Revision: 65511 URL: http://svn.reactos.org/svn/reactos?rev=65511&view=rev Log: [RTL] Import Wine commit f87767b by Piotr Caban: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=65511… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Nov 28 19:20:39 2014 @@ -4645,7 +4645,30 @@ if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { - if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) + WCHAR *source = NULL; + BOOLEAN ret; + + if (pActCtx->dwFlags & ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID && + RtlDetermineDosPathNameType_U(pActCtx->lpSource) == RtlPathTypeRelative) + { + DWORD dir_len, source_len; + + dir_len = strlenW(pActCtx->lpAssemblyDirectory); + source_len = strlenW(pActCtx->lpSource); + if (!(source = RtlAllocateHeap( RtlGetProcessHeap(), 0, (dir_len+source_len+2)*sizeof(WCHAR)))) + { + status = STATUS_NO_MEMORY; + goto error; + } + + memcpy(source, pActCtx->lpAssemblyDirectory, dir_len*sizeof(WCHAR)); + source[dir_len] = '\\'; + memcpy(source+dir_len+1, pActCtx->lpSource, (source_len+1)*sizeof(WCHAR)); + } + + ret = RtlDosPathNameToNtPathName_U(source ? source : pActCtx->lpSource, &nameW, NULL, NULL); + if (source) RtlFreeHeap( RtlGetProcessHeap(), 0, source ); + if (!ret) { status = STATUS_NO_SUCH_FILE; goto error;

1 0

[gadamopoulos] 65510: [EXPLORER] * Move some definitions in precomp.h
by gadamopoulos＠svn.reactos.org 27 Nov '14

27 Nov '14

Author: gadamopoulos Date: Thu Nov 27 21:11:29 2014 New Revision: 65510 URL: http://svn.reactos.org/svn/reactos?rev=65510&view=rev Log: [EXPLORER] * Move some definitions in precomp.h Modified: trunk/reactos/base/shell/explorer/desktop.cpp trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/shellservice.cpp trunk/reactos/base/shell/explorer/startup.cpp trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/include/reactos/undocshell.h Modified: trunk/reactos/base/shell/explorer/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop.cpp [iso-8859-1] Thu Nov 27 21:11:29 2014 @@ -19,9 +19,6 @@ */ #include "precomp.h" - -HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); -BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); class CDesktopThread { Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Thu Nov 27 21:11:29 2014 @@ -20,9 +20,6 @@ #include "precomp.h" #include <browseui_undoc.h> - -DWORD WINAPI _WinList_Init(void); -void WINAPI _ShellDDEInit(BOOL bInit); HINSTANCE hExplorerInstance; HMODULE hUser32; Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Thu Nov 27 21:11:29 2014 @@ -148,8 +148,11 @@ * rshell.c */ -HRESULT WINAPI -_CStartMenu_Constructor(REFIID riid, void **ppv); +HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv); +HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); +BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); +DWORD WINAPI _WinList_Init(void); +void WINAPI _ShellDDEInit(BOOL bInit); /* * traywnd.c @@ -232,6 +235,12 @@ IN DWORD dwValue); /* + * shellservice.cpp + */ +HRESULT InitShellServices(HDPA * phdpa); +HRESULT ShutdownShellServices(HDPA hdpa); + +/* * startup.cpp */ Modified: trunk/reactos/base/shell/explorer/shellservice.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shells… ============================================================================== --- trunk/reactos/base/shell/explorer/shellservice.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shellservice.cpp [iso-8859-1] Thu Nov 27 21:11:29 2014 @@ -19,9 +19,6 @@ */ #include "precomp.h" - -extern HRESULT InitShellServices(HDPA * phdpa); -extern HRESULT ShutdownShellServices(HDPA hdpa); static int CALLBACK InitializeAllCallback(void* pItem, void* pData) { Modified: trunk/reactos/base/shell/explorer/startup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startu… ============================================================================== --- trunk/reactos/base/shell/explorer/startup.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startup.cpp [iso-8859-1] Thu Nov 27 21:11:29 2014 @@ -39,8 +39,6 @@ */ #include "precomp.h" - -EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey); #define INVALID_RUNCMD_RETURN -1 /** Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Nov 27 21:11:29 2014 @@ -20,9 +20,6 @@ #include "precomp.h" #include <commoncontrols.h> - -extern HRESULT InitShellServices(HDPA * phdpa); -extern HRESULT ShutdownShellServices(HDPA hdpa); HRESULT TrayWindowCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Thu Nov 27 21:11:29 2014 @@ -648,6 +648,8 @@ DWORD WINAPI WinList_Init(void); IStream* WINAPI SHGetViewStream(LPCITEMIDLIST, DWORD, LPCTSTR, LPCTSTR, LPCTSTR); + +EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey); /***************************************************************************** * Shell Link

1 0

[gadamopoulos] 65509: Attempt to fix build.
by gadamopoulos＠svn.reactos.org 27 Nov '14

27 Nov '14

Author: gadamopoulos Date: Thu Nov 27 20:32:38 2014 New Revision: 65509 URL: http://svn.reactos.org/svn/reactos?rev=65509&view=rev Log: Attempt to fix build. 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 Nov 27 20:32:38 2014 @@ -5432,7 +5432,6 @@ #define DlgDirListComboBox DlgDirListComboBoxW #define DlgDirSelectComboBoxEx DlgDirSelectComboBoxExW #define DlgDirSelectEx DlgDirSelectExW -#define DrawCaptionTemp DrawCaptionTempW #define DrawState DrawStateW #define DrawText DrawTextW #define DrawTextEx DrawTextExW @@ -5599,7 +5598,6 @@ #define DlgDirListComboBox DlgDirListComboBoxA #define DlgDirSelectComboBoxEx DlgDirSelectComboBoxExA #define DlgDirSelectEx DlgDirSelectExA -#define DrawCaptionTemp DrawCaptionTempA #define DrawState DrawStateA #define DrawText DrawTextA #define DrawTextEx DrawTextExA

1 0

[pschweitzer] 65508: [FASTFAT] Properly handle shared accesses on volume open. No need to add the support for this in cleanup, it was already there.
by pschweitzer＠svn.reactos.org 27 Nov '14

27 Nov '14

Author: pschweitzer Date: Thu Nov 27 20:28:50 2014 New Revision: 65508 URL: http://svn.reactos.org/svn/reactos?rev=65508&view=rev Log: [FASTFAT] Properly handle shared accesses on volume open. No need to add the support for this in cleanup, it was already there. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Thu Nov 27 20:28:50 2014 @@ -503,6 +503,27 @@ } pFcb = DeviceExt->VolumeFcb; + + if (pFcb->OpenHandleCount == 0) + { + IoSetShareAccess(Stack->Parameters.Create.SecurityContext->DesiredAccess, + Stack->Parameters.Create.ShareAccess, + FileObject, + &pFcb->FCBShareAccess); + } + else + { + Status = IoCheckShareAccess(Stack->Parameters.Create.SecurityContext->DesiredAccess, + Stack->Parameters.Create.ShareAccess, + FileObject, + &pFcb->FCBShareAccess, + FALSE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + vfatAttachFCBToFileObject(DeviceExt, pFcb, FileObject); DeviceExt->OpenHandleCount++;

1 0

[gadamopoulos] 65507: [HEADERS] - Move definitions for DrawCaptionTemp to userundoc.h as it shouldn't be defined in the psdk - Add browseui_undoc.h and move there the undocumented definitions for b...
by gadamopoulos＠svn.reactos.org 27 Nov '14

27 Nov '14

Author: gadamopoulos Date: Thu Nov 27 20:27:19 2014 New Revision: 65507 URL: http://svn.reactos.org/svn/reactos?rev=65507&view=rev Log: [HEADERS] - Move definitions for DrawCaptionTemp to userundoc.h as it shouldn't be defined in the psdk - Add browseui_undoc.h and move there the undocumented definitions for browseui - Add comctl32_undoc.h and move there the undocumented definitions for comctl32 - Move undocumented definitions for shlwapi to shlwapi_undoc.h - Add shellutils.h to contain helper macros and definitions that are nor per se undocumented. - Cleanup internal definitions of explorer. Remove several temporary hacks. They were added at a time that these features were not implemented at all. Added: trunk/reactos/include/reactos/browseui_undoc.h - copied, changed from r65501, trunk/reactos/include/reactos/shlwapi_undoc.h trunk/reactos/include/reactos/comctl32_undoc.h - copied, changed from r65501, trunk/reactos/include/reactos/shlobj_undoc.h trunk/reactos/include/reactos/shellutils.h - copied, changed from r65501, trunk/reactos/include/reactos/undocshell.h Removed: trunk/reactos/base/shell/explorer/comcsup.h trunk/reactos/base/shell/explorer/todo.h trunk/reactos/base/shell/explorer/undoc.h Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/tbsite.cpp trunk/reactos/base/shell/filebrowser/filebrowser.c trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp trunk/reactos/base/shell/rshell/precomp.h trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/dde.cpp trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/shlobj_undoc.h trunk/reactos/include/reactos/shlwapi_undoc.h trunk/reactos/include/reactos/undocshell.h trunk/reactos/include/reactos/undocuser.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/shell/explorer/comcsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/comcsu… Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… Removed: trunk/reactos/base/shell/explorer/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/todo.h… Removed: trunk/reactos/base/shell/explorer/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/undoc.… Modified: trunk/reactos/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/filebrowser/fil… Modified: trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CDesktop… Modified: trunk/reactos/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/precomp.… Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… Modified: trunk/reactos/dll/win32/shell32/dde.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dde.cpp?… Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… Copied: trunk/reactos/include/reactos/browseui_undoc.h (from r65501, trunk/reactos/include/reactos/shlwapi_undoc.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/browseui_u… Copied: trunk/reactos/include/reactos/comctl32_undoc.h (from r65501, trunk/reactos/include/reactos/shlobj_undoc.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/comctl32_u… Copied: trunk/reactos/include/reactos/shellutils.h (from r65501, trunk/reactos/include/reactos/undocshell.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shellutils… Modified: trunk/reactos/include/reactos/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlobj_und… Modified: trunk/reactos/include/reactos/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlwapi_un… Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.…

1 0

[akhaldi] 65506: [CMAKE] * Simplify compiling some single-source-file tools.
by akhaldi＠svn.reactos.org 27 Nov '14

27 Nov '14

Author: akhaldi Date: Thu Nov 27 19:09:07 2014 New Revision: 65506 URL: http://svn.reactos.org/svn/reactos?rev=65506&view=rev Log: [CMAKE] * Simplify compiling some single-source-file tools. Removed: trunk/reactos/tools/gendib/CMakeLists.txt trunk/reactos/tools/geninc/CMakeLists.txt trunk/reactos/tools/mkshelllink/CMakeLists.txt trunk/reactos/tools/obj2bin/CMakeLists.txt trunk/reactos/tools/spec2def/CMakeLists.txt trunk/reactos/tools/utf16le/CMakeLists.txt Modified: trunk/reactos/tools/CMakeLists.txt Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Thu Nov 27 19:09:07 2014 @@ -6,22 +6,21 @@ endif() add_executable(bin2c bin2c.c) +add_executable(gendib gendib/gendib.c) +add_executable(geninc geninc/geninc.c) +add_executable(mkshelllink mkshelllink/mkshelllink.c) +add_executable(obj2bin obj2bin/obj2bin.c) +add_executable(spec2def spec2def/spec2def.c) +add_executable(utf16le utf16le/utf16le.cpp) add_subdirectory(cabman) add_subdirectory(cdmake) -add_subdirectory(gendib) -add_subdirectory(geninc) +add_subdirectory(mkhive) +add_subdirectory(unicode) +add_subdirectory(widl) +add_subdirectory(wpp) + if(NOT MSVC) add_subdirectory(log2lines) -endif() -add_subdirectory(mkhive) -add_subdirectory(obj2bin) -add_subdirectory(spec2def) -add_subdirectory(unicode) -add_subdirectory(mkshelllink) -add_subdirectory(utf16le) -add_subdirectory(widl) -add_subdirectory(wpp) -if(NOT MSVC) add_subdirectory(rsym) endif() Removed: trunk/reactos/tools/gendib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/gendib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/CMakeLists.txt (removed) @@ -1,2 +0,0 @@ - -add_executable(gendib gendib.c) Removed: trunk/reactos/tools/geninc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/geninc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/geninc/CMakeLists.txt (removed) @@ -1,2 +0,0 @@ - -add_executable(geninc geninc.c) Removed: trunk/reactos/tools/mkshelllink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/CMakeLis… ============================================================================== --- trunk/reactos/tools/mkshelllink/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/mkshelllink/CMakeLists.txt (removed) @@ -1,2 +0,0 @@ - -add_executable(mkshelllink mkshelllink.c) Removed: trunk/reactos/tools/obj2bin/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/CMakeLists.t… ============================================================================== --- trunk/reactos/tools/obj2bin/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/CMakeLists.txt (removed) @@ -1,2 +0,0 @@ - -add_executable(obj2bin obj2bin.c) Removed: trunk/reactos/tools/spec2def/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/CMakeLists.… ============================================================================== --- trunk/reactos/tools/spec2def/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/CMakeLists.txt (removed) @@ -1,2 +0,0 @@ - -add_executable(spec2def spec2def.c) Removed: trunk/reactos/tools/utf16le/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/CMakeLists.t… ============================================================================== --- trunk/reactos/tools/utf16le/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/utf16le/CMakeLists.txt (removed) @@ -1,2 +0,0 @@ - -add_executable(utf16le utf16le.cpp)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014