Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[tkreuzer] 61009: [NTOSKRNL] Don't use KiTrapReturnNoSegmentsRet8, when single stepping is active. Fixes debugging with WinDbg

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 16 15:25:44 2013 New Revision: 61009 URL: http://svn.reactos.org/svn/reactos?rev=61009&view=rev Log: [NTOSKRNL] Don't use KiTrapReturnNoSegmentsRet8, when single stepping is active. Fixes debugging with WinDbg Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Nov 16 15:25:44 2013 @@ -129,6 +129,9 @@ /* Check for edited frame */ if (KiIsFrameEdited(TrapFrame)) KiEditedTrapReturn(TrapFrame); + /* Check if we have single stepping enabled */ + if (TrapFrame->EFlags & EFLAGS_TF) KiTrapReturnNoSegments(TrapFrame); + /* Exit the trap to kernel mode */ KiTrapReturnNoSegmentsRet8(TrapFrame); } @@ -190,6 +193,9 @@ /* Check for edited frame */ if (KiIsFrameEdited(TrapFrame)) KiEditedTrapReturn(TrapFrame); + + /* Check if we have single stepping enabled */ + if (TrapFrame->EFlags & EFLAGS_TF) KiTrapReturnNoSegments(TrapFrame); /* Exit the trap to kernel mode */ KiTrapReturnNoSegmentsRet8(TrapFrame);

10 years, 10 months

[tfaber] 61008: [DDK][XDK] - Do not evaluate the ASSERT macro's parameter before stringifying it CORE-7588 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 16 15:00:11 2013 New Revision: 61008 URL: http://svn.reactos.org/svn/reactos?rev=61008&view=rev Log: [DDK][XDK] - Do not evaluate the ASSERT macro's parameter before stringifying it CORE-7588 #resolve Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6100… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Nov 16 15:00:11 2013 @@ -11010,14 +11010,27 @@ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) #define RTL_SOFT_VERIFYMSG(msg, exp) \ - (VOID)((!(exp)) ? \ + ((!(exp)) ? \ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) -#define ASSERT(exp) ((void)RTL_VERIFY(exp)) -#define ASSERTMSG(msg, exp) ((void)RTL_VERIFYMSG(msg, exp)) - -#define RTL_SOFT_ASSERT(exp) ((void)RTL_SOFT_VERIFY(exp)) -#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)RTL_SOFT_VERIFYMSG(msg, exp)) +/* The ASSERTs must be cast to void to avoid warnings about unused results. + * We also cannot invoke the VERIFY versions because the indirection messes + * with stringify. */ +#define ASSERT(exp) \ + ((VOID)((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE)) + +#define ASSERTMSG(msg, exp) \ + ((VOID)((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE)) + +#define RTL_SOFT_ASSERT(exp) \ + ((VOID)((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE)) + +#define RTL_SOFT_ASSERTMSG(msg, exp) \ + ((VOID)((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE)) #if defined(_MSC_VER) # define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg) Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sat Nov 16 15:00:11 2013 @@ -3076,14 +3076,27 @@ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) #define RTL_SOFT_VERIFYMSG(msg, exp) \ - (VOID)((!(exp)) ? \ + ((!(exp)) ? \ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) -#define ASSERT(exp) ((void)RTL_VERIFY(exp)) -#define ASSERTMSG(msg, exp) ((void)RTL_VERIFYMSG(msg, exp)) - -#define RTL_SOFT_ASSERT(exp) ((void)RTL_SOFT_VERIFY(exp)) -#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)RTL_SOFT_VERIFYMSG(msg, exp)) +/* The ASSERTs must be cast to void to avoid warnings about unused results. + * We also cannot invoke the VERIFY versions because the indirection messes + * with stringify. */ +#define ASSERT(exp) \ + ((VOID)((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE)) + +#define ASSERTMSG(msg, exp) \ + ((VOID)((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE)) + +#define RTL_SOFT_ASSERT(exp) \ + ((VOID)((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE)) + +#define RTL_SOFT_ASSERTMSG(msg, exp) \ + ((VOID)((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE)) #if defined(_MSC_VER) # define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg)

10 years, 10 months

[tfaber] 61007: [NDK] - Add RtlEraseUnicodeString ROSTESTS-126

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 16 12:02:17 2013 New Revision: 61007 URL: http://svn.reactos.org/svn/reactos?rev=61007&view=rev Log: [NDK] - Add RtlEraseUnicodeString ROSTESTS-126 Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Nov 16 12:02:17 2013 @@ -2112,10 +2112,21 @@ _Out_ PUSHORT Position ); -NTSYSAPI -VOID -NTAPI -RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString); +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +VOID +NTAPI +RtlFreeUnicodeString( + _Inout_ _At_(UnicodeString->Buffer, __drv_freesMem(Mem)) + PUNICODE_STRING UnicodeString +); + +NTSYSAPI +VOID +NTAPI +RtlEraseUnicodeString( + _Inout_ PUNICODE_STRING String +); NTSYSAPI NTSTATUS

10 years, 10 months

[tkreuzer] 61006: [WIN32K] Fix inserting LDEVOBJs into the list. Hopefully fixes CORE-7574

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 16 10:33:56 2013 New Revision: 61006 URL: http://svn.reactos.org/svn/reactos?rev=61006&view=rev Log: [WIN32K] Fix inserting LDEVOBJs into the list. Hopefully fixes CORE-7574 Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] Sat Nov 16 10:33:56 2013 @@ -186,7 +186,6 @@ Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, pDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); - if (!NT_SUCCESS(Status)) { ERR("Failed to load a GDI driver: '%wZ', Status = 0x%lx\n", @@ -424,6 +423,8 @@ /* Insert the LDEV into the global list */ pldev->pldevPrev = NULL; pldev->pldevNext = gpldevHead; + if (gpldevHead) + gpldevHead->pldevPrev = pldev; gpldevHead = pldev; }

10 years, 10 months

[ekohl] 61005: [SAMSRV] SamrDeleteUser: Prepare the removal of a user from groups and aliases.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 16 09:07:37 2013 New Revision: 61005 URL: http://svn.reactos.org/svn/reactos?rev=61005&view=rev Log: [SAMSRV] SamrDeleteUser: Prepare the removal of a user from groups and aliases. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/user.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Nov 16 09:07:37 2013 @@ -5427,9 +5427,21 @@ goto done; } - /* FIXME: Remove the user from all groups */ - - /* FIXME: Remove the user from all aliases */ + /* Remove the user from all groups */ + Status = SampRemoveUserFromAllGroups(UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRemoveUserFromAllGroups() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Remove the user from all aliases */ + Status = SampRemoveUserFromAllAliases(UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRemoveUserFromAllAliases() failed (Status 0x%08lx)\n", Status); + goto done; + } /* Delete the user from the database */ Status = SampDeleteAccountDbObject(UserObject); Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Nov 16 09:07:37 2013 @@ -384,6 +384,9 @@ SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject); NTSTATUS +SampRemoveUserFromAllAliases(IN PSAM_DB_OBJECT UserObject); + +NTSTATUS SampSetUserPassword(IN PSAM_DB_OBJECT UserObject, IN PENCRYPTED_NT_OWF_PASSWORD NtPassword, IN BOOLEAN NtPasswordPresent, Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Sat Nov 16 09:07:37 2013 @@ -380,6 +380,14 @@ midl_user_free(GroupsBuffer); return Status; +} + + +NTSTATUS +SampRemoveUserFromAllAliases(IN PSAM_DB_OBJECT UserObject) +{ + FIXME("(%p)\n", UserObject); + return STATUS_SUCCESS; }

10 years, 10 months

[tkreuzer] 61004: [BOOTDATA] Add registry keys for win32k GRE initialization and Win32 config

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 15 23:45:11 2013 New Revision: 61004 URL: http://svn.reactos.org/svn/reactos?rev=61004&view=rev Log: [BOOTDATA] Add registry keys for win32k GRE initialization and Win32 config 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] Fri Nov 15 23:45:11 2013 @@ -237,6 +237,15 @@ ; Font substitutes HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012 + +; win32k GRE initialization +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","MS Shell Dlg",0x00000002,"Microsoft Sans Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","FIXEDFON.FON",0x00000002,"vgafix.fon" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","FONTS.FON",0x00000002,"vgasys.fon" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","OEMFONT.FON",0x00000002,"vgaoem.fon" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","DisableRemoteFontBootCache",0x00010001,0x00000000 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","LastBootTimeFontCacheState",0x00010001,0x00000002 ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012 @@ -1334,6 +1343,17 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost", "netsvcs",0x00010000,"DHCP" + +; Win32 config +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","AppInit_DLLs",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DeviceNotSelectedTimeout",0x00000000,"15" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","GDIProcessHandleQuota",0x00010001,0x2710 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Spooler",0x00000000,"yes" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","swapdisk",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","TransmissionRetryTimeout",0x00000000,"90" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","USERProcessHandleQuota",0x00010001,0x2710 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1 ;-------------------------------- STRINGS -------------------------------

10 years, 10 months

[tkreuzer] 61003: [BOOTDATA] Add global RIP flags for native win32k

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 15 23:38:59 2013 New Revision: 61003 URL: http://svn.reactos.org/svn/reactos?rev=61003&view=rev Log: [BOOTDATA] Add global RIP flags for native win32k Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Fri Nov 15 23:38:59 2013 @@ -1662,6 +1662,15 @@ HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","NetMessage",2,"no" HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","NullPort",2,"None" HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Programs",2,"com exe bat pif cmd" + +; Global RIP flags for win32k +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","fPromptOnError",0x00010001,0x1 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","fPromptOnWarning",0x00010001,0x1 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","fPromptOnVerbose",0x00010001,0x1 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","fPrintError",0x00010001,0x1 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","fPrintWarning",0x00010001,0x1 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","fPrintVerbose",0x00010001,0x1 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","fPrintFileLine",0x00010001,0x1 ; Application compatibility settings for Windows 95 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\WIN95","MajorVersion",0x00010001,0x00000004

10 years, 10 months

[tfaber] 61002: [SERVICES] - Fix syntax errors in asynchronous pipe I/O code ROSTESTS-56

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 15 21:37:46 2013 New Revision: 61002 URL: http://svn.reactos.org/svn/reactos?rev=61002&view=rev Log: [SERVICES] - Fix syntax errors in asynchronous pipe I/O code ROSTESTS-56 Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Fri Nov 15 21:37:46 2013 @@ -893,7 +893,7 @@ DWORD dwError = ERROR_SUCCESS; BOOL bResult; #ifdef USE_ASYNCHRONOUS_IO - OVERLAPPED Overlapped = {0, 0, 0, 0, 0}; + OVERLAPPED Overlapped = {0}; #endif DPRINT("ScmControlService() called\n"); @@ -1111,7 +1111,7 @@ PWSTR pArgPtr; BOOL bResult; #ifdef USE_ASYNCHRONOUS_IO - OVERLAPPED Overlapped = {0, 0, 0, 0, 0}; + OVERLAPPED Overlapped = {0}; #endif DPRINT("ScmSendStartCommand() called\n"); @@ -1335,7 +1335,7 @@ DWORD dwError = ERROR_SUCCESS; BOOL bResult; #ifdef USE_ASYNCHRONOUS_IO - OVERLAPPED Overlapped = {0, 0, 0, 0, 0}; + OVERLAPPED Overlapped = {0}; #endif DPRINT("ScmWaitForServiceConnect()\n");

10 years, 10 months

[hbelusca] 61001: [SERVICES] ... and for 61001st commit: Fix the ANSI version of the server-side of ChangeServiceConfig2A API, which broke at converting SERVICE_FAILURE_ACTIONS ANSI structures into...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Nov 15 21:03:01 2013 New Revision: 61001 URL: http://svn.reactos.org/svn/reactos?rev=61001&view=rev Log: [SERVICES] ... and for 61001st commit: Fix the ANSI version of the server-side of ChangeServiceConfig2A API, which broke at converting SERVICE_FAILURE_ACTIONS ANSI structures into UNICODE ones. Fixes the VMWare Tools Installer; blame Sylvain if it doesn't ;) Based on a patch by Sylvain Petreolle. CORE-7539 #comment Fixed in revision 61001, thanks ! Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Nov 15 21:03:01 2013 @@ -4712,9 +4712,6 @@ } -// -// WARNING: This function is untested -// /* Function 36 */ DWORD RChangeServiceConfig2A( SC_RPC_HANDLE hService, @@ -4731,48 +4728,57 @@ if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { - LPSERVICE_DESCRIPTIONW lpServiceDescriptonW; - //LPSERVICE_DESCRIPTIONA lpServiceDescriptonA; - - //lpServiceDescriptonA = Info.psd; - - ///if (lpServiceDescriptonA && - ///lpServiceDescriptonA->lpDescription) + LPSERVICE_DESCRIPTIONW lpServiceDescriptionW; + //LPSERVICE_DESCRIPTIONA lpServiceDescriptionA; + + //lpServiceDescriptionA = Info.psd; + + ///if (lpServiceDescriptionA && + ///lpServiceDescriptionA->lpDescription) ///{ dwLength = (DWORD)((strlen(Info.lpDescription) + 1) * sizeof(WCHAR)); - lpServiceDescriptonW = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwLength + sizeof(SERVICE_DESCRIPTIONW)); - if (!lpServiceDescriptonW) + lpServiceDescriptionW = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwLength + sizeof(SERVICE_DESCRIPTIONW)); + if (!lpServiceDescriptionW) { return ERROR_NOT_ENOUGH_MEMORY; } - lpServiceDescriptonW->lpDescription = (LPWSTR)(lpServiceDescriptonW + 1); + lpServiceDescriptionW->lpDescription = (LPWSTR)(lpServiceDescriptionW + 1); MultiByteToWideChar(CP_ACP, 0, Info.lpDescription, -1, - lpServiceDescriptonW->lpDescription, + lpServiceDescriptionW->lpDescription, dwLength); - ptr = lpServiceDescriptonW; - InfoW.psd = lpServiceDescriptonW; + ptr = lpServiceDescriptionW; + InfoW.psd = lpServiceDescriptionW; ///} } else if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { LPSERVICE_FAILURE_ACTIONSW lpServiceFailureActionsW; LPSERVICE_FAILURE_ACTIONSA lpServiceFailureActionsA; - DWORD dwRebootLen = 0; + DWORD dwRebootLen = 0; DWORD dwCommandLen = 0; + DWORD dwActionArrayLen = 0; + LPWSTR lpStr = NULL; lpServiceFailureActionsA = Info.psfa; if (lpServiceFailureActionsA) { + /* + * The following code is inspired by the + * SERVICE_CONFIG_FAILURE_ACTIONS case of + * the RQueryServiceConfig2W function. + */ + + /* Retrieve the needed length for the two data strings */ if (lpServiceFailureActionsA->lpRebootMsg) { dwRebootLen = (DWORD)((strlen(lpServiceFailureActionsA->lpRebootMsg) + 1) * sizeof(WCHAR)); @@ -4781,8 +4787,22 @@ { dwCommandLen = (DWORD)((strlen(lpServiceFailureActionsA->lpCommand) + 1) * sizeof(WCHAR)); } - dwLength = dwRebootLen + dwCommandLen + sizeof(SERVICE_FAILURE_ACTIONSW); - + + /* + * Retrieve the size of the lpsaActions array if needed. + * We will copy the lpsaActions array only if there is at + * least one action AND that the original array is valid. + */ + if (lpServiceFailureActionsA->cActions > 0 && lpServiceFailureActionsA->lpsaActions) + { + dwActionArrayLen = lpServiceFailureActionsA->cActions * sizeof(SC_ACTION); + } + + /* Compute the total length for the UNICODE structure, including data */ + dwLength = sizeof(SERVICE_FAILURE_ACTIONSW) + + dwActionArrayLen + dwRebootLen + dwCommandLen; + + /* Allocate the structure */ lpServiceFailureActionsW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); @@ -4791,22 +4811,56 @@ return ERROR_NOT_ENOUGH_MEMORY; } - lpServiceFailureActionsW->cActions = lpServiceFailureActionsA->cActions; + /* Copy the members */ lpServiceFailureActionsW->dwResetPeriod = lpServiceFailureActionsA->dwResetPeriod; - CopyMemory(lpServiceFailureActionsW->lpsaActions, lpServiceFailureActionsA->lpsaActions, sizeof(SC_ACTION)); - - if (lpServiceFailureActionsA->lpRebootMsg) + lpServiceFailureActionsW->cActions = lpServiceFailureActionsA->cActions; + + /* Copy the lpsaActions array if needed */ + if (dwActionArrayLen > 0) { + /* The storage zone is just after the end of the SERVICE_FAILURE_ACTIONSW structure */ + lpServiceFailureActionsW->lpsaActions = (LPSC_ACTION)((ULONG_PTR)(lpServiceFailureActionsW + 1)); + + /* dwActionArrayLen == lpServiceFailureActionsW->cActions * sizeof(SC_ACTION) */ + RtlCopyMemory(lpServiceFailureActionsW->lpsaActions, + lpServiceFailureActionsA->lpsaActions, + dwActionArrayLen); + } + else + { + /* No lpsaActions array */ + lpServiceFailureActionsW->lpsaActions = NULL; + } + /* The data strings are stored just after the lpsaActions array */ + lpStr = (LPWSTR)((ULONG_PTR)(lpServiceFailureActionsW + 1) + dwActionArrayLen); + + /* + * Convert the data strings to UNICODE + */ + + lpServiceFailureActionsW->lpRebootMsg = NULL; + lpServiceFailureActionsW->lpCommand = NULL; + + if (dwRebootLen) + { + /* lpRebootMsg points just after the lpsaActions array */ + lpServiceFailureActionsW->lpRebootMsg = lpStr; + MultiByteToWideChar(CP_ACP, 0, lpServiceFailureActionsA->lpRebootMsg, -1, lpServiceFailureActionsW->lpRebootMsg, dwRebootLen); + + lpStr += dwRebootLen / sizeof(WCHAR); } - if (lpServiceFailureActionsA->lpCommand) + if (dwCommandLen) { + /* lpRebootMsg points just after the lpRebootMsg data string */ + lpServiceFailureActionsW->lpCommand = lpStr; + MultiByteToWideChar(CP_ACP, 0, lpServiceFailureActionsA->lpCommand, @@ -4815,7 +4869,9 @@ dwCommandLen); } + /* Set the pointers */ ptr = lpServiceFailureActionsW; + InfoW.psfa = lpServiceFailureActionsW; } }

10 years, 10 months

[aandrejevic] 61000: [FAST486] - When accessing memory using ESP, make the SS segment default. - The INT instructions always pushes 16-bit values in real mode, regardless of the operand/address siz...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Nov 15 20:49:48 2013 New Revision: 61000 URL: http://svn.reactos.org/svn/reactos?rev=61000&view=rev Log: [FAST486] - When accessing memory using ESP, make the SS segment default. - The INT instructions always pushes 16-bit values in real mode, regardless of the operand/address size attributes. Modified: branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Fri Nov 15 20:49:48 2013 @@ -240,6 +240,14 @@ if (!Fast486StackPush(State, OldEsp)) return FALSE; } } + else + { + if (State->SegmentRegs[FAST486_REG_CS].Size) + { + /* Set OPSIZE, because INT always pushes 16-bit values in real mode */ + State->PrefixFlags |= FAST486_PREFIX_OPSIZE; + } + } /* Push EFLAGS */ if (!Fast486StackPush(State, State->Flags.Long)) return FALSE; Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Fri Nov 15 20:49:48 2013 @@ -730,6 +730,17 @@ } } + if ((SibByte & 0x07) == FAST486_REG_ESP) + { + /* Check if there is no segment override */ + if (!(State->PrefixFlags & FAST486_PREFIX_SEG)) + { + /* Add a SS: prefix */ + State->PrefixFlags |= FAST486_PREFIX_SEG; + State->SegmentOverride = FAST486_REG_SS; + } + } + /* Calculate the address */ ModRegRm->MemoryAddress = Base + Index * Scale; }

10 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
35
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 November 2013