Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61921: [MSVCRT] * Add the generated stubs file to build. Fixes some MSVC x64 link issues.
by akhaldi＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: akhaldi Date: Sun Feb 2 15:47:52 2014 New Revision: 61921 URL: http://svn.reactos.org/svn/reactos?rev=61921&view=rev Log: [MSVCRT] * Add the generated stubs file to build. Fixes some MSVC x64 link issues. Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sun Feb 2 15:47:52 2014 @@ -16,6 +16,7 @@ dllmain.c stubs.c msvcrt.rc + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def) add_library(msvcrt SHARED ${SOURCE})

1 0

[hbelusca] 61920: [NTVDM]: German translation by Robert Naumann, thanks! CORE-7250
by hbelusca＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: hbelusca Date: Sun Feb 2 14:01:21 2014 New Revision: 61920 URL: http://svn.reactos.org/svn/reactos?rev=61920&view=rev Log: [NTVDM]: German translation by Robert Naumann, thanks! CORE-7250 Added: branches/ntvdm/subsystems/ntvdm/lang/de-DE.rc (with props) Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc Added: branches/ntvdm/subsystems/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/lang/de-… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/lang/de-DE.rc (added) +++ branches/ntvdm/subsystems/ntvdm/lang/de-DE.rc [iso-8859-1] Sun Feb 2 14:01:21 2014 @@ -0,0 +1,13 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_HIDE_MOUSE, "Mauszeiger &verstecken" + IDS_SHOW_MOUSE, "Mauszeiger &anzeigen" + IDS_VDM_MENU , "&ReactOS VDM" +END + +STRINGTABLE +BEGIN + IDS_VDM_QUIT, "ReactOS VDM b&eenden" +END Propchange: branches/ntvdm/subsystems/ntvdm/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.rc… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] Sun Feb 2 14:01:21 2014 @@ -19,6 +19,9 @@ #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.rc" #endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

[ekohl] 61919: [MSGINA] Move the LSA connection code into a separate file. This connection code will later be used by the logon code too.
by ekohl＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: ekohl Date: Sun Feb 2 12:12:59 2014 New Revision: 61919 URL: http://svn.reactos.org/svn/reactos?rev=61919&view=rev Log: [MSGINA] Move the LSA connection code into a separate file. This connection code will later be used by the logon code too. Added: trunk/reactos/dll/win32/msgina/lsa.c (with props) Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Sun Feb 2 12:12:59 2014 @@ -7,6 +7,7 @@ list(APPEND SOURCE gui.c + lsa.c msgina.c stubs.c tui.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] Sun Feb 2 12:12:59 2014 @@ -259,9 +259,6 @@ ULONG RequestBufferSize; ULONG ResponseBufferSize = 0; LPWSTR Ptr; - LSA_STRING PackageName; - HANDLE LsaHandle = NULL; - ULONG AuthenticationPackage = 0; BOOL res = FALSE; NTSTATUS ProtocolStatus; NTSTATUS Status; @@ -349,29 +346,15 @@ RequestBuffer->NewPassword.MaximumLength); /* Connect to the LSA server */ - Status = LsaConnectUntrusted(&LsaHandle); - if (!NT_SUCCESS(Status)) - { - ERR("LsaConnectUntrusted failed (Status 0x%08lx)\n", Status); - goto done; - } - - /* Get the authentication package */ - RtlInitAnsiString((PANSI_STRING)&PackageName, - MSV1_0_PACKAGE_NAME); - - Status = LsaLookupAuthenticationPackage(LsaHandle, - &PackageName, - &AuthenticationPackage); - if (!NT_SUCCESS(Status)) - { - ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); - goto done; + if (!ConnectToLsa(pgContext)) + { + ERR("ConnectToLsa() failed\n"); + return FALSE; } /* Call the authentication package */ - Status = LsaCallAuthenticationPackage(LsaHandle, - AuthenticationPackage, + Status = LsaCallAuthenticationPackage(pgContext->LsaHandle, + pgContext->AuthenticationPackage, RequestBuffer, RequestBufferSize, (PVOID*)&ResponseBuffer, @@ -403,9 +386,6 @@ if (ResponseBuffer != NULL) LsaFreeReturnBuffer(ResponseBuffer); - - if (LsaHandle != NULL) - NtClose(LsaHandle); return res; } Added: trunk/reactos/dll/win32/msgina/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lsa.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/lsa.c (added) +++ trunk/reactos/dll/win32/msgina/lsa.c [iso-8859-1] Sun Feb 2 12:12:59 2014 @@ -0,0 +1,52 @@ +/* + * PROJECT: ReactOS msgina.dll + * FILE: dll/win32/msgina/gui.c + * PURPOSE: ReactOS Logon GINA DLL + * PROGRAMMER: Eric Kohl + */ + +#include "msgina.h" + +BOOL +ConnectToLsa( + PGINA_CONTEXT pgContext) +{ + LSA_STRING LogonProcessName; + LSA_STRING PackageName; + LSA_OPERATIONAL_MODE SecurityMode = 0; + NTSTATUS Status; + + /* We are already connected to the LSA */ + if (pgContext->LsaHandle != NULL) + return TRUE; + + /* Connect to the LSA server */ + RtlInitAnsiString((PANSI_STRING)&LogonProcessName, + "MSGINA"); + + Status = LsaRegisterLogonProcess(&LogonProcessName, + &pgContext->LsaHandle, + &SecurityMode); + if (!NT_SUCCESS(Status)) + { + ERR("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + /* Get the authentication package */ + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(pgContext->LsaHandle, + &PackageName, + &pgContext->AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msgina/lsa.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Feb 2 12:12:59 2014 @@ -38,6 +38,8 @@ PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; HWND hStatusWindow; + HANDLE LsaHandle; + ULONG AuthenticationPackage; DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon; @@ -82,6 +84,12 @@ PFGINA_DISPLAYLOCKEDNOTICE DisplayLockedNotice; } GINA_UI, *PGINA_UI; +/* lsa.c */ + +BOOL +ConnectToLsa( + PGINA_CONTEXT pgContext); + /* msgina.c */ BOOL

1 0

[akhaldi] 61918: [CMAKE/GCC] * Add -lgcc for C++ modules too. Dedicated to Timo.
by akhaldi＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: akhaldi Date: Sun Feb 2 11:11:53 2014 New Revision: 61918 URL: http://svn.reactos.org/svn/reactos?rev=61918&view=rev Log: [CMAKE/GCC] * Add -lgcc for C++ modules too. Dedicated to Timo. Modified: trunk/reactos/toolchain-gcc.cmake Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=61… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Sun Feb 2 11:11:53 2014 @@ -59,7 +59,7 @@ set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) -set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") +set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries") set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")

1 0

[hbelusca] 61917: [NTVDM] - Sorry !!!!!! The previous translation (Polish, revision 61916 ) was by Wojtek Kozlowski aka. wojo664!! Sorry for having mistaken you with Radek Liska! - Czesh translatio...
by hbelusca＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: hbelusca Date: Sun Feb 2 00:43:52 2014 New Revision: 61917 URL: http://svn.reactos.org/svn/reactos?rev=61917&view=rev Log: [NTVDM] - Sorry !!!!!! The previous translation (Polish, revision 61916 ) was by Wojtek Kozlowski aka. wojo664!! Sorry for having mistaken you with Radek Liska! - Czesh translation by Radek Liska :D, thanks! CORE-7250 Added: branches/ntvdm/subsystems/ntvdm/lang/cs-CZ.rc (with props) Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc Added: branches/ntvdm/subsystems/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/lang/cs-… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/lang/cs-CZ.rc (added) +++ branches/ntvdm/subsystems/ntvdm/lang/cs-CZ.rc [iso-8859-1] Sun Feb 2 00:43:52 2014 @@ -0,0 +1,19 @@ +/* + * FILE: subsystems/ntvdm/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2014-02-01 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HIDE_MOUSE, "&SkrÃ½t ukazatel myÅ¡i" + IDS_SHOW_MOUSE, "&Zobrazit ukazatel myÅ¡i" + IDS_VDM_MENU , "ReactOS &VDM" +END + +STRINGTABLE +BEGIN + IDS_VDM_QUIT, "&UkonÄit ReactOS VDM" +END Propchange: branches/ntvdm/subsystems/ntvdm/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.rc… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] Sun Feb 2 00:43:52 2014 @@ -16,6 +16,9 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

[hbelusca] 61916: [NTVDM]: Polish translation by Radek Liska, thanks! CORE-7835 #resolve CORE-7250
by hbelusca＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: hbelusca Date: Sun Feb 2 00:34:48 2014 New Revision: 61916 URL: http://svn.reactos.org/svn/reactos?rev=61916&view=rev Log: [NTVDM]: Polish translation by Radek Liska, thanks! CORE-7835 #resolve CORE-7250 Added: branches/ntvdm/subsystems/ntvdm/lang/pl-PL.rc (with props) Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc Added: branches/ntvdm/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/lang/pl-… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/lang/pl-PL.rc (added) +++ branches/ntvdm/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] Sun Feb 2 00:34:48 2014 @@ -0,0 +1,15 @@ +// Created by wojo664 - Saved in UTF-8 encoding + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HIDE_MOUSE, "&Ukryj WskaÅºnik Myszki" + IDS_SHOW_MOUSE, "&PokaÅ¼ WskaÅºnik Myszki" + IDS_VDM_MENU , "ReactOS &VDM" +END + +STRINGTABLE +BEGIN + IDS_VDM_QUIT, "&WyjdÅº z ReactOS VDM" +END Propchange: branches/ntvdm/subsystems/ntvdm/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.rc… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] Sun Feb 2 00:34:48 2014 @@ -28,3 +28,6 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif

1 0

[hbelusca] 61915: Sync with trunk rev.61914 for BaseVdm fixes.
by hbelusca＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: hbelusca Date: Sun Feb 2 00:25:25 2014 New Revision: 61915 URL: http://svn.reactos.org/svn/reactos?rev=61915&view=rev Log: Sync with trunk rev.61914 for BaseVdm fixes. Modified: branches/ntvdm/ (props changed) branches/ntvdm/dll/win32/kernel32/client/proc.c branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/dll/win32/kernel32/include/vdm.h Propchange: branches/ntvdm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 2 00:25:25 2014 @@ -16,4 +16,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:59241-61910 +/trunk/reactos:59241-61914 Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Feb 2 00:25:25 2014 @@ -2378,7 +2378,7 @@ ANSI_STRING VdmAnsiEnv; UNICODE_STRING VdmString, VdmUnicodeEnv; BOOLEAN IsWowApp; - PBASE_CHECK_VDM VdmMsg; + PBASE_CHECK_VDM CheckVdmMsg; /* Zero out the initial core variables and handles */ QuerySection = FALSE; @@ -2433,7 +2433,7 @@ /* Set message structures */ CreateProcessMsg = &CsrMsg.Data.CreateProcessRequest; - VdmMsg = &CsrMsg.Data.CheckVDMRequest; + CheckVdmMsg = &CsrMsg.Data.CheckVDMRequest; /* Clear the more complex structures by zeroing out their entire memory */ RtlZeroMemory(&Context, sizeof(Context)); @@ -3206,7 +3206,7 @@ lpCommandLine, lpCurrentDirectory, &VdmAnsiEnv, - (PCSR_API_MESSAGE)VdmMsg, + &CsrMsg, &VdmTask, dwCreationFlags, &StartupInfo, @@ -3232,9 +3232,9 @@ } /* Check which VDM state we're currently in */ - switch (VdmMsg->VDMState & (VDM_NOT_LOADED | - VDM_NOT_READY | - VDM_READY)) + switch (CheckVdmMsg->VDMState & (VDM_NOT_LOADED | + VDM_NOT_READY | + VDM_READY)) { case VDM_NOT_LOADED: /* VDM is not fully loaded, so not that much to undo */ @@ -3274,7 +3274,7 @@ VdmUndoLevel = VDM_UNDO_REUSE; /* Check if CSRSS wants us to wait on VDM */ - VdmWaitObject = VdmMsg->WaitObjectForParent; + VdmWaitObject = CheckVdmMsg->WaitObjectForParent; break; case VDM_NOT_READY: @@ -3343,7 +3343,7 @@ lpCommandLine, lpCurrentDirectory, &VdmAnsiEnv, - (PCSR_API_MESSAGE)VdmMsg, + &CsrMsg, &VdmTask, dwCreationFlags, &StartupInfo, @@ -3358,9 +3358,9 @@ }; /* Handle possible VDM states */ - switch (VdmMsg->VDMState & (VDM_NOT_LOADED | - VDM_NOT_READY | - VDM_READY)) + switch (CheckVdmMsg->VDMState & (VDM_NOT_LOADED | + VDM_NOT_READY | + VDM_READY)) { case VDM_NOT_LOADED: /* If VDM is not loaded, we'll do a partial undo */ @@ -3397,7 +3397,7 @@ VdmUndoLevel = VDM_UNDO_REUSE; /* Check if CSRSS wants us to wait on VDM */ - VdmWaitObject = VdmMsg->WaitObjectForParent; + VdmWaitObject = CheckVdmMsg->WaitObjectForParent; break; case VDM_NOT_READY: @@ -4254,7 +4254,7 @@ { /* IA32, IA64 and AMD64 are supported in Server 2003 */ case IMAGE_FILE_MACHINE_I386: - CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; + CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; break; case IMAGE_FILE_MACHINE_IA64: CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_IA64; Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun Feb 2 00:25:25 2014 @@ -71,7 +71,7 @@ IN PCWCH CommandLine, IN PCWCH CurrentDirectory, IN PANSI_STRING AnsiEnvironment, - IN PCSR_API_MESSAGE ApiMessage, + IN PBASE_API_MESSAGE ApiMessage, IN OUT PULONG iTask, IN DWORD CreationFlags, IN LPSTARTUPINFOW StartupInfo, Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] Sun Feb 2 00:25:25 2014 @@ -127,7 +127,7 @@ IN PCWCH CommandLine, IN PCWCH CurrentDirectory, IN PANSI_STRING AnsiEnvironment, - IN PCSR_API_MESSAGE ApiMessage, + IN PBASE_API_MESSAGE ApiMessage, IN OUT PULONG iTask, IN DWORD CreationFlags, IN LPSTARTUPINFOW StartupInfo,

1 0

[hbelusca] 61914: [KERNEL32]: Fix build by fixing variables types.
by hbelusca＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: hbelusca Date: Sun Feb 2 00:17:16 2014 New Revision: 61914 URL: http://svn.reactos.org/svn/reactos?rev=61914&view=rev Log: [KERNEL32]: Fix build by fixing variables types. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/include/vdm.h Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun Feb 2 00:17:16 2014 @@ -71,7 +71,7 @@ IN PCWCH CommandLine, IN PCWCH CurrentDirectory, IN PANSI_STRING AnsiEnvironment, - IN PCSR_API_MESSAGE ApiMessage, + IN PBASE_API_MESSAGE ApiMessage, IN OUT PULONG iTask, IN DWORD CreationFlags, IN LPSTARTUPINFOW StartupInfo, Modified: trunk/reactos/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/vdm.h [iso-8859-1] Sun Feb 2 00:17:16 2014 @@ -95,7 +95,7 @@ IN PCWCH CommandLine, IN PCWCH CurrentDirectory, IN PANSI_STRING AnsiEnvironment, - IN PCSR_API_MESSAGE ApiMessage, + IN PBASE_API_MESSAGE ApiMessage, IN OUT PULONG iTask, IN DWORD CreationFlags, IN LPSTARTUPINFOW StartupInfo,

1 0

[hbelusca] 61913: [KERNEL32] Remove spurious cast to CSR_API_MESSAGE. What should be noted is that CsrMsg is used by both VDM thing (via CheckVdmMsg pointer) and CreateProcess thing (via CreateProc...
by hbelusca＠svn.reactos.org 02 Feb '14

02 Feb '14

Author: hbelusca Date: Sun Feb 2 00:08:54 2014 New Revision: 61913 URL: http://svn.reactos.org/svn/reactos?rev=61913&view=rev Log: [KERNEL32] Remove spurious cast to CSR_API_MESSAGE. What should be noted is that CsrMsg is used by both VDM thing (via CheckVdmMsg pointer) and CreateProcess thing (via CreateProcessMsg), but one after the other (first VDM only, then CreateProcess only) so that, even if the common struct/union CsrMsg is used in both cases, there is no data corruption by, e.g. CreateProcess using pieces of VDM data and vice-versa. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Feb 2 00:08:54 2014 @@ -2378,7 +2378,7 @@ ANSI_STRING VdmAnsiEnv; UNICODE_STRING VdmString, VdmUnicodeEnv; BOOLEAN IsWowApp; - PBASE_CHECK_VDM VdmMsg; + PBASE_CHECK_VDM CheckVdmMsg; /* Zero out the initial core variables and handles */ QuerySection = FALSE; @@ -2433,7 +2433,7 @@ /* Set message structures */ CreateProcessMsg = &CsrMsg.Data.CreateProcessRequest; - VdmMsg = &CsrMsg.Data.CheckVDMRequest; + CheckVdmMsg = &CsrMsg.Data.CheckVDMRequest; /* Clear the more complex structures by zeroing out their entire memory */ RtlZeroMemory(&Context, sizeof(Context)); @@ -3206,7 +3206,7 @@ lpCommandLine, lpCurrentDirectory, &VdmAnsiEnv, - (PCSR_API_MESSAGE)VdmMsg, + &CsrMsg, &VdmTask, dwCreationFlags, &StartupInfo, @@ -3232,9 +3232,9 @@ } /* Check which VDM state we're currently in */ - switch (VdmMsg->VDMState & (VDM_NOT_LOADED | - VDM_NOT_READY | - VDM_READY)) + switch (CheckVdmMsg->VDMState & (VDM_NOT_LOADED | + VDM_NOT_READY | + VDM_READY)) { case VDM_NOT_LOADED: /* VDM is not fully loaded, so not that much to undo */ @@ -3274,7 +3274,7 @@ VdmUndoLevel = VDM_UNDO_REUSE; /* Check if CSRSS wants us to wait on VDM */ - VdmWaitObject = VdmMsg->WaitObjectForParent; + VdmWaitObject = CheckVdmMsg->WaitObjectForParent; break; case VDM_NOT_READY: @@ -3343,7 +3343,7 @@ lpCommandLine, lpCurrentDirectory, &VdmAnsiEnv, - (PCSR_API_MESSAGE)VdmMsg, + &CsrMsg, &VdmTask, dwCreationFlags, &StartupInfo, @@ -3358,9 +3358,9 @@ }; /* Handle possible VDM states */ - switch (VdmMsg->VDMState & (VDM_NOT_LOADED | - VDM_NOT_READY | - VDM_READY)) + switch (CheckVdmMsg->VDMState & (VDM_NOT_LOADED | + VDM_NOT_READY | + VDM_READY)) { case VDM_NOT_LOADED: /* If VDM is not loaded, we'll do a partial undo */ @@ -3397,7 +3397,7 @@ VdmUndoLevel = VDM_UNDO_REUSE; /* Check if CSRSS wants us to wait on VDM */ - VdmWaitObject = VdmMsg->WaitObjectForParent; + VdmWaitObject = CheckVdmMsg->WaitObjectForParent; break; case VDM_NOT_READY: @@ -4254,7 +4254,7 @@ { /* IA32, IA64 and AMD64 are supported in Server 2003 */ case IMAGE_FILE_MACHINE_I386: - CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; + CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; break; case IMAGE_FILE_MACHINE_IA64: CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_IA64;

1 0

[aandrejevic] 61912: [KERNEL32] CreateProcessInternalW expects BaseCheckVDM to return a NTSTATUS, not a BOOL.
by aandrejevic＠svn.reactos.org 01 Feb '14

01 Feb '14

Author: aandrejevic Date: Sat Feb 1 23:24:06 2014 New Revision: 61912 URL: http://svn.reactos.org/svn/reactos?rev=61912&view=rev Log: [KERNEL32] CreateProcessInternalW expects BaseCheckVDM to return a NTSTATUS, not a BOOL. Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/dll/win32/kernel32/include/vdm.h Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat Feb 1 23:24:06 2014 @@ -64,7 +64,7 @@ return 0; } -BOOL +NTSTATUS WINAPI BaseCheckVDM(IN ULONG BinaryType, IN PCWCH ApplicationName, @@ -79,7 +79,7 @@ { /* This is not supported */ UNIMPLEMENTED; - return FALSE; + return STATUS_NOT_IMPLEMENTED; } BOOL Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] Sat Feb 1 23:24:06 2014 @@ -119,7 +119,7 @@ OUT LPDWORD ExitCode ); -BOOL +NTSTATUS WINAPI BaseCheckVDM( IN ULONG BinaryType,

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