Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 60349: [WIN23K] Fix prototype of NtUserNotifyProcessCreate and BASE_PROCESS_CREATE_NOTIFY_ROUTINE
by tkreuzer＠svn.reactos.org 25 Sep '13

25 Sep '13

Author: tkreuzer Date: Wed Sep 25 17:14:21 2013 New Revision: 60349 URL: http://svn.reactos.org/svn/reactos?rev=60349&view=rev Log: [WIN23K] Fix prototype of NtUserNotifyProcessCreate and BASE_PROCESS_CREATE_NOTIFY_ROUTINE Modified: trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Wed Sep 25 17:14:21 2013 @@ -11,7 +11,13 @@ #pragma once -typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID); +typedef +BOOL +(CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)( + HANDLE NewProcessId, + HANDLE SourceThreadId, + DWORD dwUnknown, + ULONG CreateFlags); NTSTATUS WINAPI BaseSetProcessCreateNotify(BASE_PROCESS_CREATE_NOTIFY_ROUTINE); @@ -62,7 +68,7 @@ } NLS_USER_INFO, *PNLS_USER_INFO; C_ASSERT(sizeof(NLS_USER_INFO) == 0x1870); -typedef struct _INIFILE_MAPPING_TARGET +typedef struct _INIFILE_MAPPING_TARGET { struct _INIFILE_MAPPING_TARGET *Next; UNICODE_STRING RegistryPath; @@ -125,7 +131,9 @@ BOOLEAN LUIDDeviceMapsEnabled; ULONG TermsrvClientTimeZoneChangeNum; } BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; +#ifndef _WIN64 C_ASSERT(sizeof(BASE_STATIC_SERVER_DATA) == 0x1AC8); +#endif VOID WINAPI BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData); Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Sep 25 17:14:21 2013 @@ -2436,7 +2436,7 @@ DWORD Unknown1, DWORD Unknown2); -DWORD +BOOL NTAPI NtUserNotifyProcessCreate( HANDLE NewProcessId, Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Sep 25 17:14:21 2013 @@ -707,7 +707,7 @@ return 0; } -DWORD +BOOL NTAPI NtUserNotifyProcessCreate( HANDLE NewProcessId, @@ -716,7 +716,7 @@ ULONG CreateFlags) { STUB; - return 0; + return FALSE; } NTSTATUS

1 0

[hbelusca] 60348: [RTL] Implement and export RtlGetLengthWithoutTrailingPathSeperators (aka. RtlGetLengthWithoutTrailingPathSeparators) (needed for win2k3's basesrv.dll). Patch by David Quintana, w...
by hbelusca＠svn.reactos.org 24 Sep '13

24 Sep '13

Author: hbelusca Date: Tue Sep 24 22:16:30 2013 New Revision: 60348 URL: http://svn.reactos.org/svn/reactos?rev=60348&view=rev Log: [RTL] Implement and export RtlGetLengthWithoutTrailingPathSeperators (aka. RtlGetLengthWithoutTrailingPathSeparators) (needed for win2k3's basesrv.dll). Patch by David Quintana, where I simplified the loop (and reduced the number of local variables). CORE-7482 #comment Function committed in revision 60348, thanks ;) Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Tue Sep 24 22:16:30 2013 @@ -630,7 +630,7 @@ @ stdcall RtlGetLastWin32Error() @ stdcall RtlGetLengthWithoutLastFullDosOrNtPathElement(long ptr ptr) ; Yes, Microsoft really misspelled this one! -;@ stdcall RtlGetLengthWithoutTrailingPathSeperators +@ stdcall RtlGetLengthWithoutTrailingPathSeperators(long ptr ptr) RtlGetLengthWithoutTrailingPathSeparators @ stdcall RtlGetLongestNtPathLength() @ stdcall RtlGetNativeSystemInformation(long long long long) NtQuerySystemInformation @ stdcall RtlGetNextRange(ptr ptr long) 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] Tue Sep 24 22:16:30 2013 @@ -2723,6 +2723,15 @@ _Out_opt_ PBOOLEAN NameInvalid, _Out_ RTL_PATH_TYPE* PathType, _Out_opt_ PSIZE_T LengthNeeded +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlGetLengthWithoutTrailingPathSeparators( + _In_ ULONG Flags, + _In_ PCUNICODE_STRING PathString, + _Out_ PULONG Length ); NTSYSAPI Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=60348&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Tue Sep 24 22:16:30 2013 @@ -1253,6 +1253,48 @@ /* * @implemented + * @note: the export is called RtlGetLengthWithoutTrailingPathSeperators + * (with a 'e' instead of a 'a' in "Seperators"). + */ +NTSTATUS +NTAPI +RtlGetLengthWithoutTrailingPathSeparators(IN ULONG Flags, + IN PCUNICODE_STRING PathString, + OUT PULONG Length) +{ + ULONG NumChars; + + /* Parameters validation */ + if (Length == NULL) return STATUS_INVALID_PARAMETER; + + *Length = 0; + + if (PathString == NULL) return STATUS_INVALID_PARAMETER; + + /* No flags are supported yet */ + if (Flags != 0) return STATUS_INVALID_PARAMETER; + + NumChars = PathString->Length / sizeof(WCHAR); + + /* + * Notice that we skip the last character, therefore: + * - if we have: "some/path/f" we test for: "some/path/" + * - if we have: "some/path/" we test for: "some/path" + * - if we have: "s" we test for: "" + * - if we have: "" then NumChars was already zero and we aren't there + */ + + while (NumChars > 0 && IS_PATH_SEPARATOR(PathString->Buffer[NumChars - 1])) + { + --NumChars; + } + + *Length = NumChars; + return STATUS_SUCCESS; +} + +/* + * @implemented */ RTL_PATH_TYPE NTAPI

1 0

[akhaldi] 60347: [GDI32_APITEST] * Fix GCC warnings. * Enable -Werror again. * Remove redundant test header inclusion. * Speedup linking.
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 21:54:01 2013 New Revision: 60347 URL: http://svn.reactos.org/svn/reactos?rev=60347&view=rev Log: [GDI32_APITEST] * Fix GCC warnings. * Enable -Werror again. * Remove redundant test header inclusion. * Speedup linking. Modified: trunk/rostests/apitests/gdi32/AddFontResource.c trunk/rostests/apitests/gdi32/CMakeLists.txt Modified: trunk/rostests/apitests/gdi32/AddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] Mon Sep 23 21:54:01 2013 @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <stdio.h> #include <apitest.h> - -#include <wine/test.h> #include <wingdi.h> #define COUNT 26 Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Mon Sep 23 21:54:01 2013 @@ -1,5 +1,4 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/win32ss) list(APPEND SOURCE @@ -62,14 +61,8 @@ init.c testlist.c) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(gdi32_apitest) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_executable(gdi32_apitest ${SOURCE}) -target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) +target_link_libraries(gdi32_apitest ${PSEH_LIB}) set_module_type(gdi32_apitest win32cui) -add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32) add_cd_file(TARGET gdi32_apitest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 60346: [POWRPROF_APITEST] * Fix GCC warnings. * Enable -Werror again. * Speedup linking.
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 21:45:58 2013 New Revision: 60346 URL: http://svn.reactos.org/svn/reactos?rev=60346&view=rev Log: [POWRPROF_APITEST] * Fix GCC warnings. * Enable -Werror again. * Speedup linking. Modified: trunk/rostests/apitests/powrprof/CMakeLists.txt trunk/rostests/apitests/powrprof/power.c Modified: trunk/rostests/apitests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/CMakeLi… ============================================================================== --- trunk/rostests/apitests/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/CMakeLists.txt [iso-8859-1] Mon Sep 23 21:45:58 2013 @@ -1,9 +1,5 @@ add_executable(powrprof_apitest power.c testlist.c) set_module_type(powrprof_apitest win32cui) -add_importlibs(powrprof_apitest advapi32 powrprof msvcrt kernel32 ntdll) +add_importlibs(powrprof_apitest advapi32 powrprof msvcrt kernel32) add_cd_file(TARGET powrprof_apitest DESTINATION reactos/bin FOR all) - -if(NOT MSVC) - allow_warnings(powrprof_apitest) -endif() Modified: trunk/rostests/apitests/powrprof/power.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c… ============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Mon Sep 23 21:45:58 2013 @@ -733,7 +733,7 @@ ret = TRUE; if (gpp.mach.BroadcastCapacityResolution != gpp_compare.mach.BroadcastCapacityResolution) { - printf("mach.BroadcastCapacityResolution failed %i != %i\n",gpp.mach.BroadcastCapacityResolution,gpp_compare.mach.BroadcastCapacityResolution); + printf("mach.BroadcastCapacityResolution failed %lu != %lu\n",gpp.mach.BroadcastCapacityResolution,gpp_compare.mach.BroadcastCapacityResolution); ret = FALSE; } if (gpp.mach.LidOpenWakeAc != gpp_compare.mach.LidOpenWakeAc) @@ -748,7 +748,7 @@ } if (gpp.mach.Revision != gpp_compare.mach.Revision) { - printf("mach.Revision failed %i != %i\n",gpp.mach.Revision,gpp_compare.mach.Revision); + printf("mach.Revision failed %lu != %lu\n",gpp.mach.Revision,gpp_compare.mach.Revision); ret = FALSE; } @@ -759,12 +759,12 @@ } if (gpp.user.PowerButtonAc.EventCode != gpp_compare.user.PowerButtonAc.EventCode) { - printf("user.PowerButtonAc.EventCode failed %i != %i\n",gpp.user.PowerButtonAc.EventCode,gpp_compare.user.PowerButtonAc.EventCode); + printf("user.PowerButtonAc.EventCode failed %lu != %lu\n",gpp.user.PowerButtonAc.EventCode,gpp_compare.user.PowerButtonAc.EventCode); ret = FALSE; } if (gpp.user.PowerButtonAc.Flags != gpp_compare.user.PowerButtonAc.Flags) { - printf("user.PowerButtonAc.Flags failed %i != %i\n",gpp.user.PowerButtonAc.Flags,gpp_compare.user.PowerButtonAc.Flags); + printf("user.PowerButtonAc.Flags failed %lu != %lu\n",gpp.user.PowerButtonAc.Flags,gpp_compare.user.PowerButtonAc.Flags); ret = FALSE; } if (gpp.user.PowerButtonDc.Action != gpp_compare.user.PowerButtonDc.Action) @@ -774,12 +774,12 @@ } if (gpp.user.PowerButtonDc.EventCode != gpp_compare.user.PowerButtonDc.EventCode) { - printf("user.PowerButtonDc.EventCode failed %i != %i\n",gpp.user.PowerButtonDc.EventCode,gpp_compare.user.PowerButtonDc.EventCode); + printf("user.PowerButtonDc.EventCode failed %lu != %lu\n",gpp.user.PowerButtonDc.EventCode,gpp_compare.user.PowerButtonDc.EventCode); ret = FALSE; } if (gpp.user.PowerButtonDc.Flags != gpp_compare.user.PowerButtonDc.Flags) { - printf("user.PowerButtonDc.Flags failed %i != %i\n",gpp.user.PowerButtonDc.Flags,gpp_compare.user.PowerButtonDc.Flags); + printf("user.PowerButtonDc.Flags failed %lu != %lu\n",gpp.user.PowerButtonDc.Flags,gpp_compare.user.PowerButtonDc.Flags); ret = FALSE; } if (gpp.user.SleepButtonAc.Action != gpp_compare.user.SleepButtonAc.Action) @@ -789,12 +789,12 @@ } if (gpp.user.SleepButtonAc.EventCode != gpp_compare.user.SleepButtonAc.EventCode) { - printf("user.SleepButtonAc.EventCode failed %i != %i\n",gpp.user.SleepButtonAc.EventCode,gpp_compare.user.SleepButtonAc.EventCode); + printf("user.SleepButtonAc.EventCode failed %lu != %lu\n",gpp.user.SleepButtonAc.EventCode,gpp_compare.user.SleepButtonAc.EventCode); ret = FALSE; } if (gpp.user.SleepButtonAc.Flags != gpp_compare.user.SleepButtonAc.Flags) { - printf("user.SleepButtonAc.Flags failed %i != %i\n",gpp.user.SleepButtonAc.Flags,gpp_compare.user.SleepButtonAc.Flags); + printf("user.SleepButtonAc.Flags failed %lu != %lu\n",gpp.user.SleepButtonAc.Flags,gpp_compare.user.SleepButtonAc.Flags); ret = FALSE; } if (gpp.user.SleepButtonDc.Action != gpp_compare.user.SleepButtonDc.Action) @@ -804,12 +804,12 @@ } if (gpp.user.SleepButtonDc.EventCode != gpp_compare.user.SleepButtonDc.EventCode) { - printf("user.SleepButtonDc.EventCode failed %i != %i\n",gpp.user.SleepButtonDc.EventCode,gpp_compare.user.SleepButtonDc.EventCode); + printf("user.SleepButtonDc.EventCode failed %lu != %lu\n",gpp.user.SleepButtonDc.EventCode,gpp_compare.user.SleepButtonDc.EventCode); ret = FALSE; } if (gpp.user.SleepButtonDc.Flags != gpp_compare.user.SleepButtonDc.Flags) { - printf("user.SleepButtonDc.Flags failed %i != %i\n",gpp.user.SleepButtonDc.Flags,gpp_compare.user.SleepButtonDc.Flags); + printf("user.SleepButtonDc.Flags failed %lu != %lu\n",gpp.user.SleepButtonDc.Flags,gpp_compare.user.SleepButtonDc.Flags); ret = FALSE; } if (gpp.user.LidCloseAc.Action != gpp_compare.user.LidCloseAc.Action) @@ -819,12 +819,12 @@ } if (gpp.user.LidCloseAc.EventCode != gpp_compare.user.LidCloseAc.EventCode) { - printf("user.LidCloseAc.EventCode failed %i != %i\n",gpp.user.LidCloseAc.EventCode,gpp_compare.user.LidCloseAc.EventCode); + printf("user.LidCloseAc.EventCode failed %lu != %lu\n",gpp.user.LidCloseAc.EventCode,gpp_compare.user.LidCloseAc.EventCode); ret = FALSE; } if (gpp.user.LidCloseAc.Flags != gpp_compare.user.LidCloseAc.Flags) { - printf("user.LidCloseAc.Flags failed %i != %i\n",gpp.user.LidCloseAc.Flags,gpp_compare.user.LidCloseAc.Flags); + printf("user.LidCloseAc.Flags failed %lu != %lu\n",gpp.user.LidCloseAc.Flags,gpp_compare.user.LidCloseAc.Flags); ret = FALSE; } if (gpp.user.LidCloseDc.Action != gpp_compare.user.LidCloseDc.Action) @@ -834,12 +834,12 @@ } if (gpp.user.LidCloseDc.EventCode != gpp_compare.user.LidCloseDc.EventCode) { - printf("user.LidCloseDc.EventCode failed %i != %i\n",gpp.user.LidCloseDc.EventCode,gpp_compare.user.LidCloseDc.EventCode); + printf("user.LidCloseDc.EventCode failed %lu != %lu\n",gpp.user.LidCloseDc.EventCode,gpp_compare.user.LidCloseDc.EventCode); ret = FALSE; } if (gpp.user.LidCloseDc.Flags != gpp_compare.user.LidCloseDc.Flags) { - printf("user.LidCloseDc.Flags failed %i != %i\n",gpp.user.LidCloseDc.Flags,gpp_compare.user.LidCloseDc.Flags); + printf("user.LidCloseDc.Flags failed %lu != %lu\n",gpp.user.LidCloseDc.Flags,gpp_compare.user.LidCloseDc.Flags); ret = FALSE; } @@ -860,7 +860,7 @@ } if (gpp.user.DischargePolicy[i].BatteryLevel != gpp_compare.user.DischargePolicy[i].BatteryLevel) { - printf("user.DischargePolicy(%i).BatteryLevel failed %i != %i\n",i, gpp.user.DischargePolicy[i].BatteryLevel,gpp_compare.user.DischargePolicy[i].BatteryLevel); + printf("user.DischargePolicy(%i).BatteryLevel failed %lu != %lu\n",i, gpp.user.DischargePolicy[i].BatteryLevel,gpp_compare.user.DischargePolicy[i].BatteryLevel); ret = FALSE; } if (gpp.user.DischargePolicy[i].PowerPolicy.Action != gpp_compare.user.DischargePolicy[i].PowerPolicy.Action) @@ -870,12 +870,12 @@ } if (gpp.user.DischargePolicy[i].PowerPolicy.Flags != gpp_compare.user.DischargePolicy[i].PowerPolicy.Flags) { - printf("user.DischargePolicy(%i).PowerPolicy.Flags failed %i != %i\n",i, gpp.user.DischargePolicy[i].PowerPolicy.Flags,gpp_compare.user.DischargePolicy[i].PowerPolicy.Flags); + printf("user.DischargePolicy(%i).PowerPolicy.Flags failed %lu != %lu\n",i, gpp.user.DischargePolicy[i].PowerPolicy.Flags,gpp_compare.user.DischargePolicy[i].PowerPolicy.Flags); ret = FALSE; } if (gpp.user.DischargePolicy[i].PowerPolicy.EventCode != gpp_compare.user.DischargePolicy[i].PowerPolicy.EventCode) { - printf("user.DischargePolicy(%i).PowerPolicy.EventCode failed %i != %i\n",i, gpp.user.DischargePolicy[i].PowerPolicy.EventCode,gpp_compare.user.DischargePolicy[i].PowerPolicy.EventCode); + printf("user.DischargePolicy(%i).PowerPolicy.EventCode failed %lu != %lu\n",i, gpp.user.DischargePolicy[i].PowerPolicy.EventCode,gpp_compare.user.DischargePolicy[i].PowerPolicy.EventCode); ret = FALSE; } if (gpp.user.DischargePolicy[i].MinSystemState != gpp_compare.user.DischargePolicy[i].MinSystemState) @@ -886,12 +886,12 @@ } if (gpp.user.GlobalFlags != gpp_compare.user.GlobalFlags) { - printf("user.GlobalFlags failed %i != %i\n",gpp.user.GlobalFlags,gpp_compare.user.GlobalFlags); + printf("user.GlobalFlags failed %lu != %lu\n",gpp.user.GlobalFlags,gpp_compare.user.GlobalFlags); ret = FALSE; } if (gpp.user.Revision != gpp_compare.user.Revision) { - printf("user.Revision failed %i != %i\n",gpp.user.Revision,gpp_compare.user.Revision); + printf("user.Revision failed %lu != %lu\n",gpp.user.Revision,gpp_compare.user.Revision); ret = FALSE; } return ret; @@ -903,12 +903,12 @@ if (pp.mach.DozeS4TimeoutAc != pp_compare.mach.DozeS4TimeoutAc) { - printf("mach.DozeS4TimeoutAc failed %i != %i\n",pp.mach.DozeS4TimeoutAc,pp_compare.mach.DozeS4TimeoutAc); + printf("mach.DozeS4TimeoutAc failed %lu != %lu\n",pp.mach.DozeS4TimeoutAc,pp_compare.mach.DozeS4TimeoutAc); ret = FALSE; } if (pp.mach.DozeS4TimeoutDc != pp_compare.mach.DozeS4TimeoutDc) { - printf("mach.DozeS4TimeoutDc failed %i != %i\n",pp.mach.DozeS4TimeoutDc,pp_compare.mach.DozeS4TimeoutDc); + printf("mach.DozeS4TimeoutDc failed %lu != %lu\n",pp.mach.DozeS4TimeoutDc,pp_compare.mach.DozeS4TimeoutDc); ret = FALSE; } if (pp.mach.MinSleepAc != pp_compare.mach.MinSleepAc) @@ -923,12 +923,12 @@ } if (pp.mach.DozeTimeoutAc != pp_compare.mach.DozeTimeoutAc) { - printf("mach.DozeTimeoutAc failed %i != %i\n",pp.mach.DozeTimeoutAc,pp_compare.mach.DozeTimeoutAc); + printf("mach.DozeTimeoutAc failed %lu != %lu\n",pp.mach.DozeTimeoutAc,pp_compare.mach.DozeTimeoutAc); ret = FALSE; } if (pp.mach.DozeTimeoutDc != pp_compare.mach.DozeTimeoutDc) { - printf("mach.DozeTimeoutDc failed %i != %i\n",pp.mach.DozeTimeoutDc,pp_compare.mach.DozeTimeoutDc); + printf("mach.DozeTimeoutDc failed %lu != %lu\n",pp.mach.DozeTimeoutDc,pp_compare.mach.DozeTimeoutDc); ret = FALSE; } if (pp.mach.ReducedLatencySleepAc != pp_compare.mach.ReducedLatencySleepAc) @@ -959,12 +959,12 @@ } if (pp.mach.OverThrottledAc.Flags != pp_compare.mach.OverThrottledAc.Flags) { - printf("mach.OverThrottledAc.Flags failed %i != %i\n",pp.mach.OverThrottledAc.Flags,pp_compare.mach.OverThrottledAc.Flags); + printf("mach.OverThrottledAc.Flags failed %lu != %lu\n",pp.mach.OverThrottledAc.Flags,pp_compare.mach.OverThrottledAc.Flags); ret = FALSE; } if (pp.mach.OverThrottledAc.EventCode != pp_compare.mach.OverThrottledAc.EventCode) { - printf("mach.OverThrottledAc.EventCode failed %i != %i\n",pp.mach.OverThrottledAc.EventCode,pp_compare.mach.OverThrottledAc.EventCode); + printf("mach.OverThrottledAc.EventCode failed %lu != %lu\n",pp.mach.OverThrottledAc.EventCode,pp_compare.mach.OverThrottledAc.EventCode); ret = FALSE; } if (pp.mach.OverThrottledDc.Action != pp_compare.mach.OverThrottledDc.Action) @@ -974,12 +974,12 @@ } if (pp.mach.OverThrottledDc.Flags != pp_compare.mach.OverThrottledDc.Flags) { - printf("mach.OverThrottledDc.Flags failed %i != %i\n",pp.mach.OverThrottledDc.Flags,pp_compare.mach.OverThrottledDc.Flags); + printf("mach.OverThrottledDc.Flags failed %lu != %lu\n",pp.mach.OverThrottledDc.Flags,pp_compare.mach.OverThrottledDc.Flags); ret = FALSE; } if (pp.mach.OverThrottledDc.EventCode != pp_compare.mach.OverThrottledDc.EventCode) { - printf("mach.OverThrottledDc.EventCode failed %i != %i\n",pp.mach.OverThrottledDc.EventCode,pp_compare.mach.OverThrottledDc.EventCode); + printf("mach.OverThrottledDc.EventCode failed %lu != %lu\n",pp.mach.OverThrottledDc.EventCode,pp_compare.mach.OverThrottledDc.EventCode); ret = FALSE; } @@ -995,7 +995,7 @@ } if (pp.mach.Revision != pp_compare.mach.Revision) { - printf("mach.Revision failed %i != %i\n",pp.mach.Revision,pp_compare.mach.Revision); + printf("mach.Revision failed %lu != %lu\n",pp.mach.Revision,pp_compare.mach.Revision); ret = FALSE; } @@ -1006,12 +1006,12 @@ } if (pp.user.IdleAc.Flags != pp_compare.user.IdleAc.Flags) { - printf("user.IdleAc.Flags failed %i != %i\n",pp.user.IdleAc.Flags,pp_compare.user.IdleAc.Flags); + printf("user.IdleAc.Flags failed %lu != %lu\n",pp.user.IdleAc.Flags,pp_compare.user.IdleAc.Flags); ret = FALSE; } if (pp.user.IdleAc.EventCode != pp_compare.user.IdleAc.EventCode) { - printf("user.IdleAc.EventCode failed %i != %i\n",pp.user.IdleAc.EventCode,pp_compare.user.IdleAc.EventCode); + printf("user.IdleAc.EventCode failed %lu != %lu\n",pp.user.IdleAc.EventCode,pp_compare.user.IdleAc.EventCode); ret = FALSE; } if (pp.user.IdleDc.Action != pp_compare.user.IdleDc.Action) @@ -1021,22 +1021,22 @@ } if (pp.user.IdleDc.Flags != pp_compare.user.IdleDc.Flags) { - printf("user.IdleDc.Flags failed %i != %i\n",pp.user.IdleDc.Flags,pp_compare.user.IdleDc.Flags); + printf("user.IdleDc.Flags failed %lu != %lu\n",pp.user.IdleDc.Flags,pp_compare.user.IdleDc.Flags); ret = FALSE; } if (pp.user.IdleDc.EventCode != pp_compare.user.IdleDc.EventCode) { - printf("user.IdleDc.EventCode failed %i != %i\n",pp.user.IdleDc.EventCode,pp_compare.user.IdleDc.EventCode); + printf("user.IdleDc.EventCode failed %lu != %lu\n",pp.user.IdleDc.EventCode,pp_compare.user.IdleDc.EventCode); ret = FALSE; } if (pp.user.IdleTimeoutAc != pp_compare.user.IdleTimeoutAc) { - printf("user.IdleTimeoutAc failed %i != %i\n",pp.user.IdleTimeoutAc,pp_compare.user.IdleTimeoutAc); + printf("user.IdleTimeoutAc failed %lu != %lu\n",pp.user.IdleTimeoutAc,pp_compare.user.IdleTimeoutAc); ret = FALSE; } if (pp.user.IdleTimeoutDc != pp_compare.user.IdleTimeoutDc) { - printf("user.IdleTimeoutDc failed %i != %i\n",pp.user.IdleTimeoutDc,pp_compare.user.IdleTimeoutDc); + printf("user.IdleTimeoutDc failed %lu != %lu\n",pp.user.IdleTimeoutDc,pp_compare.user.IdleTimeoutDc); ret = FALSE; } if (pp.user.IdleSensitivityAc != pp_compare.user.IdleSensitivityAc) @@ -1071,38 +1071,38 @@ } if (pp.user.Reserved[0] != pp_compare.user.Reserved[0]) { - printf("user.Reserved[0] failed %i != %i\n",pp.user.Reserved[0],pp_compare.user.Reserved[0]); + printf("user.Reserved[0] failed %lu != %lu\n",pp.user.Reserved[0],pp_compare.user.Reserved[0]); ret = FALSE; } if (pp.user.Reserved[1] != pp_compare.user.Reserved[1]) { - printf("user.Reserved[1] failed %i != %i\n",pp.user.Reserved[1],pp_compare.user.Reserved[1]); + printf("user.Reserved[1] failed %lu != %lu\n",pp.user.Reserved[1],pp_compare.user.Reserved[1]); ret = FALSE; } if (pp.user.Reserved[2] != pp_compare.user.Reserved[2]) { - printf("user.Reserved[2] failed %i != %i\n",pp.user.Reserved[2],pp_compare.user.Reserved[2]); + printf("user.Reserved[2] failed %lu != %lu\n",pp.user.Reserved[2],pp_compare.user.Reserved[2]); ret = FALSE; } if (pp.user.VideoTimeoutAc != pp_compare.user.VideoTimeoutAc) { - printf("user.VideoTimeoutAc failed %i != %i\n",pp.user.VideoTimeoutAc,pp_compare.user.VideoTimeoutAc); + printf("user.VideoTimeoutAc failed %lu != %lu\n",pp.user.VideoTimeoutAc,pp_compare.user.VideoTimeoutAc); ret = FALSE; } if (pp.user.VideoTimeoutDc != pp_compare.user.VideoTimeoutDc) { - printf("user.VideoTimeoutDc failed %i != %i\n",pp.user.VideoTimeoutDc,pp_compare.user.VideoTimeoutDc); + printf("user.VideoTimeoutDc failed %lu != %lu\n",pp.user.VideoTimeoutDc,pp_compare.user.VideoTimeoutDc); ret = FALSE; } if (pp.user.SpindownTimeoutAc != pp_compare.user.SpindownTimeoutAc) { - printf("user.SpindownTimeoutAc failed %i != %i\n",pp.user.SpindownTimeoutAc,pp_compare.user.SpindownTimeoutAc); + printf("user.SpindownTimeoutAc failed %lu != %lu\n",pp.user.SpindownTimeoutAc,pp_compare.user.SpindownTimeoutAc); ret = FALSE; } if (pp.user.SpindownTimeoutDc != pp_compare.user.SpindownTimeoutDc) { - printf("user.SpindownTimeoutDc failed %i != %i\n",pp.user.SpindownTimeoutDc,pp_compare.user.SpindownTimeoutDc); + printf("user.SpindownTimeoutDc failed %lu != %lu\n",pp.user.SpindownTimeoutDc,pp_compare.user.SpindownTimeoutDc); ret = FALSE; } if (pp.user.OptimizeForPowerAc != pp_compare.user.OptimizeForPowerAc) @@ -1137,7 +1137,7 @@ } if (pp.user.Revision != pp_compare.user.Revision) { - printf("user.Revision failed %i != %i\n",pp.user.Revision,pp_compare.user.Revision); + printf("user.Revision failed %lu != %lu\n",pp.user.Revision,pp_compare.user.Revision); ret = FALSE; }

1 0

[hbelusca] 60345: [BUGCODES] Introduce the DRIVER_UNMAPPING_INVALID_VIEW bugcheck code and use it.
by hbelusca＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: hbelusca Date: Mon Sep 23 21:12:39 2013 New Revision: 60345 URL: http://svn.reactos.org/svn/reactos?rev=60345&view=rev Log: [BUGCODES] Introduce the DRIVER_UNMAPPING_INVALID_VIEW bugcheck code and use it. Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Mon Sep 23 21:12:39 2013 @@ -1389,7 +1389,15 @@ Facility=System SymbolicName=DRIVER_PORTION_MUST_BE_NONPAGED Language=English -The driver mistakenly marked a part of it's image pageable instead of non-pageable. +The driver mistakenly marked a part of its image pageable instead of non-pageable. +. + +MessageId=0xD7 +Severity=Success +Facility=System +SymbolicName=DRIVER_UNMAPPING_INVALID_VIEW +Language=English +The driver is attempting to unmap an invalid memory address. . MessageId=0xD8 Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Sep 23 21:12:39 2013 @@ -2117,7 +2117,7 @@ if (++Count == 2) { /* But if we overflew twice, then this is not a real mapping */ - KeBugCheckEx(0xD7, //DRIVER_UNMAPPING_INVALID_VIEW, + KeBugCheckEx(DRIVER_UNMAPPING_INVALID_VIEW, (ULONG_PTR)Base, 1, 0, @@ -2821,7 +2821,7 @@ if (++Count == 2) { /* But if we overflew twice, then this is not a real mapping */ - KeBugCheckEx(0xD7, //DRIVER_UNMAPPING_INVALID_VIEW, + KeBugCheckEx(DRIVER_UNMAPPING_INVALID_VIEW, Base, 2, 0,

1 0

[aandrejevic] 60344: [SOFT386] Implement the IMUL instruction. Both versions have been implemented in Soft386OpcodeImulModrm.
by aandrejevic＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: aandrejevic Date: Mon Sep 23 17:29:42 2013 New Revision: 60344 URL: http://svn.reactos.org/svn/reactos?rev=60344&view=rev Log: [SOFT386] Implement the IMUL instruction. Both versions have been implemented in Soft386OpcodeImulModrm. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Mon Sep 23 17:29:42 2013 @@ -11,6 +11,7 @@ // #define WIN32_NO_STATUS // #define _INC_WINDOWS #include <windef.h> +#include <limits.h> // #define NDEBUG #include <debug.h> @@ -131,7 +132,7 @@ Soft386OpcodePushImm, Soft386OpcodeImulModrmImm, Soft386OpcodePushByteImm, - Soft386OpcodeImulModrmByteImm, + Soft386OpcodeImulModrmImm, NULL, // TODO: OPCODE 0x6C NOT SUPPORTED NULL, // TODO: OPCODE 0x6D NOT SUPPORTED NULL, // TODO: OPCODE 0x6E NOT SUPPORTED @@ -3797,10 +3798,125 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + BOOLEAN OperandSize, AddressSize; + SOFT386_MOD_REG_RM ModRegRm; + LONG Multiplier; + LONGLONG Product; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x69); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + /* Fetch the parameters */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (Opcode == 0x6B) + { + CHAR Byte; + + /* Fetch the immediate operand */ + if (!Soft386FetchByte(State, (PUCHAR)&Byte)) + { + /* Exception occurred */ + return FALSE; + } + + Multiplier = (LONG)Byte; + } + else + { + if (OperandSize) + { + LONG Dword; + + /* Fetch the immediate operand */ + if (!Soft386FetchDword(State, (PULONG)&Dword)) + { + /* Exception occurred */ + return FALSE; + } + + Multiplier = Dword; + } + else + { + SHORT Word; + + /* Fetch the immediate operand */ + if (!Soft386FetchWord(State, (PUSHORT)&Word)) + { + /* Exception occurred */ + return FALSE; + } + + Multiplier = (LONG)Word; + } + } + + if (OperandSize) + { + LONG RegValue, Multiplicand; + + /* Read the operands */ + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + (PULONG)&RegValue, + (PULONG)&Multiplicand)) + { + /* Exception occurred */ + return FALSE; + } + + /* Multiply */ + Product = (LONGLONG)Multiplicand * (LONGLONG)Multiplier; + } + else + { + SHORT RegValue, Multiplicand; + + /* Read the operands */ + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + (PUSHORT)&RegValue, + (PUSHORT)&Multiplicand)) + { + /* Exception occurred */ + return FALSE; + } + + /* Multiply */ + Product = (LONGLONG)Multiplicand * (LONGLONG)Multiplier; + } + + /* Check for carry/overflow */ + if ((Product < LONG_MIN) || (Product > LONG_MAX)) + { + State->Flags.Cf = State->Flags.Of = TRUE; + } + else State->Flags.Cf = State->Flags.Of = FALSE; + + /* Write-back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + (ULONG)((LONG)Product)); } SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm) @@ -3818,14 +3934,6 @@ /* Call the internal API */ return Soft386StackPush(State, Data); -} - -SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmByteImm) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteModrm) Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Mon Sep 23 17:29:42 2013 @@ -101,7 +101,6 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm); SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm); SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm); -SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmByteImm); SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeMovModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeMovStoreSeg);

1 0

[akhaldi] 60343: [CMAKE/MSVC] * Drop /link from executable link lines.
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 17:29:13 2013 New Revision: 60343 URL: http://svn.reactos.org/svn/reactos?rev=60343&view=rev Log: [CMAKE/MSVC] * Drop /link from executable link lines. Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-MSV… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Mon Sep 23 17:29:13 2013 @@ -227,7 +227,6 @@ set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /FoNUL /FAs /Fa<ASSEMBLY_SOURCE> /c <SOURCE>${CMAKE_END_TEMP_FILE}") - set(CMAKE_${lang}_COMPILER_LINKER_OPTION_FLAG_EXECUTABLE "/link") set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1) set(CMAKE_${lang}_LINK_EXECUTABLE "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")

1 0

[aandrejevic] 60342: [SOFT386] Implement the AAM and AAD instructions.
by aandrejevic＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: aandrejevic Date: Mon Sep 23 16:03:23 2013 New Revision: 60342 URL: http://svn.reactos.org/svn/reactos?rev=60342&view=rev Log: [SOFT386] Implement the AAM and AAD instructions. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Mon Sep 23 16:03:23 2013 @@ -4525,18 +4525,72 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeAam) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + UCHAR Base; + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Fetch the base */ + if (!Soft386FetchByte(State, &Base)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if the base is zero */ + if (Base == 0) + { + /* Divide error */ + Soft386Exception(State, SOFT386_EXCEPTION_DE); + return FALSE; + } + + /* Adjust */ + State->GeneralRegs[SOFT386_REG_EAX].HighByte = Value / Base; + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Value %= Base; + + /* Update flags */ + State->Flags.Zf = (Value == 0) ? TRUE : FALSE; + State->Flags.Sf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Value); + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeAad) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + UCHAR Base; + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Fetch the base */ + if (!Soft386FetchByte(State, &Base)) + { + /* Exception occurred */ + return FALSE; + } + + /* Adjust */ + Value += State->GeneralRegs[SOFT386_REG_EAX].HighByte * Base; + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Value; + + /* Update flags */ + State->Flags.Zf = (Value == 0) ? TRUE : FALSE; + State->Flags.Sf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Value); + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat)

1 0

[aandrejevic] 60341: [SOFT386] Implement the POPF instruction.
by aandrejevic＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: aandrejevic Date: Mon Sep 23 14:10:14 2013 New Revision: 60341 URL: http://svn.reactos.org/svn/reactos?rev=60341&view=rev Log: [SOFT386] Implement the POPF instruction. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Mon Sep 23 14:10:14 2013 @@ -227,7 +227,9 @@ typedef union _SOFT386_FLAGS_REG { + USHORT LowWord; ULONG Long; + struct { ULONG Cf : 1; Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Mon Sep 23 14:10:14 2013 @@ -4162,10 +4162,135 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodePopFlags) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + INT Cpl = Soft386GetCurrentPrivLevel(State); + ULONG NewFlags; + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* This OPSIZE prefix toggles the size */ + Size = !Size; + } + + /* Pop the new flags */ + if (!Soft386StackPop(State, &NewFlags)) + { + /* Exception occurred */ + return FALSE; + } + + if (!State->Flags.Vm) + { + /* Check the current privilege level */ + if (Cpl == 0) + { + /* Supervisor */ + + /* Set the flags */ + if (Size) + { + /* Memorize the old state of RF */ + BOOLEAN OldRf = State->Flags.Rf; + + State->Flags.Long = NewFlags; + + /* Restore VM and RF */ + State->Flags.Vm = FALSE; + State->Flags.Rf = OldRf; + + /* Clear VIF and VIP */ + State->Flags.Vif = State->Flags.Vip = FALSE; + } + else State->Flags.LowWord = LOWORD(NewFlags); + + /* Restore the reserved bits */ + State->Flags.AlwaysSet = TRUE; + State->Flags.Reserved0 = FALSE; + State->Flags.Reserved1 = FALSE; + } + else + { + /* User */ + + /* Memorize the old state of IF and IOPL */ + BOOLEAN OldIf = State->Flags.If; + UINT OldIopl = State->Flags.Iopl; + + /* Set the flags */ + if (Size) + { + /* Memorize the old state of RF */ + BOOLEAN OldRf = State->Flags.Rf; + + State->Flags.Long = NewFlags; + + /* Restore VM and RF */ + State->Flags.Vm = FALSE; + State->Flags.Rf = OldRf; + + /* Clear VIF and VIP */ + State->Flags.Vif = State->Flags.Vip = FALSE; + } + else State->Flags.LowWord = LOWORD(NewFlags); + + /* Restore the reserved bits and IOPL */ + State->Flags.AlwaysSet = TRUE; + State->Flags.Reserved0 = FALSE; + State->Flags.Reserved1 = FALSE; + State->Flags.Iopl = OldIopl; + + /* Check if the user doesn't have the privilege to change IF */ + if (Cpl > State->Flags.Iopl) + { + /* Restore IF */ + State->Flags.If = OldIf; + } + } + } + else + { + /* Check the IOPL */ + if (State->Flags.Iopl == 3) + { + if (Size) + { + /* Memorize the old state of RF, VIF and VIP */ + BOOLEAN OldRf = State->Flags.Rf; + BOOLEAN OldVif = State->Flags.Vif; + BOOLEAN OldVip = State->Flags.Vip; + + State->Flags.Long = NewFlags; + + /* Restore VM, RF, VIF and VIP */ + State->Flags.Vm = TRUE; + State->Flags.Rf = OldRf; + State->Flags.Vif = OldVif; + State->Flags.Vip = OldVip; + } + else State->Flags.LowWord = LOWORD(NewFlags); + + /* Restore the reserved bits and IOPL */ + State->Flags.AlwaysSet = TRUE; + State->Flags.Reserved0 = FALSE; + State->Flags.Reserved1 = FALSE; + State->Flags.Iopl = 3; + } + else + { + /* Call the VM86 monitor */ + Soft386ExceptionWithErrorCode(State, SOFT386_EXCEPTION_GP, 0); + } + + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf)

1 0

[akhaldi] 60340: [MSXML3_WINETEST] * Sync with Wine 1.7.1. CORE-7469 ROSTESTS-100 #resolve #comment Fixed by the r60340 sync.
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 11:39:45 2013 New Revision: 60340 URL: http://svn.reactos.org/svn/reactos?rev=60340&view=rev Log: [MSXML3_WINETEST] * Sync with Wine 1.7.1. CORE-7469 ROSTESTS-100 #resolve #comment Fixed by the r60340 sync. Modified: trunk/rostests/winetests/msxml3/CMakeLists.txt trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/httpreq.c trunk/rostests/winetests/msxml3/saxreader.c Modified: trunk/rostests/winetests/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:39:45 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE domdoc.c @@ -14,7 +12,6 @@ add_executable(msxml3_winetest ${SOURCE} rsrc.rc) add_idl_headers(xmlparser_idlheader_test xmlparser.idl) add_dependencies(msxml3_winetest xmlparser_idlheader_test) -target_link_libraries(msxml3_winetest wine) set_module_type(msxml3_winetest win32cui) add_importlibs(msxml3_winetest user32 ole32 oleaut32 msvcrt kernel32 ntdll) add_cd_file(TARGET msxml3_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Mon Sep 23 11:39:45 2013 @@ -393,6 +393,15 @@ '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\'','1','.','0','\'',' ', 'e','n','c','o','d','i','n','g','=','\'','W','i','n','d','o','w','s','-','1','2','5','2','\'','?','>','\n', '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 +}; + +static const char complete7[] = { + "<?xml version=\"1.0\"?>\n\t" + "<root>\n" + "\t<a/>\n" + "\t<b/>\n" + "\t<c/>\n" + "</root>" }; #define DECL_WIN_1252 \ @@ -445,6 +454,13 @@ " </elem>\n" "</root>\n"; +static const char charrefsxml[] = +"<?xml version='1.0'?>" +"<a>" +"<b1> Text A end </b1>" +"<b2>AB C </b2>" +"</a>"; + static const CHAR szNodeTypesXML[] = "<?xml version='1.0'?>" "" @@ -4190,10 +4206,62 @@ IXMLDOMNode_Release(node2); } +static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) +{ + static const WCHAR b1_p[] = {' ','T','e','x','t',' ','A',' ','e','n','d',' ',0}; + static const WCHAR b1_i[] = {'T','e','x','t',' ','A',' ','e','n','d',0}; + static const WCHAR b2_p[] = {'A','B',' ','C',' ',0}; + static const WCHAR b2_i[] = {'A','B',' ','C',0}; + IXMLDOMNodeList *list; + IXMLDOMElement *root; + IXMLDOMNode *node; + const WCHAR *text; + VARIANT_BOOL b; + HRESULT hr; + BSTR s; + + hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc, preserve); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(charrefsxml), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_get_documentElement(doc, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_get_childNodes(root, &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMElement_Release(root); + + text = preserve == VARIANT_TRUE ? b1_p : b1_i; + hr = IXMLDOMNodeList_get_item(list, 0, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_text(node, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s)); + SysFreeString(s); + IXMLDOMNode_Release(node); + + text = preserve == VARIANT_TRUE ? b2_p : b2_i; + hr = IXMLDOMNodeList_get_item(list, 1, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_text(node, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s)); + SysFreeString(s); + IXMLDOMNode_Release(node); + + IXMLDOMNodeList_Release(list); +} + static void test_whitespace(void) { + IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + IXMLDOMNodeList *list; + IXMLDOMElement *root; VARIANT_BOOL b; - IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + HRESULT hr; + LONG len; doc1 = create_document(&IID_IXMLDOMDocument2); doc2 = create_document(&IID_IXMLDOMDocument2); @@ -4260,10 +4328,35 @@ check_ws_preserved(doc3, NULL); check_ws_ignored(doc4, NULL); - IXMLDOMDocument2_Release(doc1); IXMLDOMDocument2_Release(doc2); IXMLDOMDocument2_Release(doc3); IXMLDOMDocument2_Release(doc4); + + /* text with char references */ + test_preserve_charref(doc1, VARIANT_TRUE); + test_preserve_charref(doc1, VARIANT_FALSE); + + /* formatting whitespaces */ + hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc1, _bstr_(complete7), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "for %x\n", b); + + hr = IXMLDOMDocument2_get_documentElement(doc1, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMElement_get_childNodes(root, &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = 0; + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 3, "got %d\n", len); + IXMLDOMNodeList_Release(list); + IXMLDOMElement_Release(root); + + IXMLDOMDocument2_Release(doc1); + free_bstrs(); } @@ -4304,9 +4397,49 @@ { NULL } }; +typedef struct { + const char *query; + const char *list; +} xpath_test_t; + +static const xpath_test_t xpath_test[] = { + { "*/a", "E1.E1.E2.D1 E1.E2.E2.D1 E1.E4.E2.D1" }, + { "*/b", "E2.E1.E2.D1 E2.E2.E2.D1 E2.E4.E2.D1" }, + { "*/c", "E3.E1.E2.D1 E3.E2.E2.D1" }, + { "*/d", "E4.E1.E2.D1 E4.E2.E2.D1 E4.E4.E2.D1" }, + { "//a", "E1.E1.E2.D1 E1.E2.E2.D1 E1.E4.E2.D1" }, + { "//b", "E2.E1.E2.D1 E2.E2.E2.D1 E2.E4.E2.D1" }, + { "//c", "E3.E1.E2.D1 E3.E2.E2.D1" }, + { "//d", "E4.E1.E2.D1 E4.E2.E2.D1 E4.E4.E2.D1" }, + { "//c[@type]", "E3.E2.E2.D1" }, + { "//c[@type]/ancestor::node()[1]", "E2.E2.D1" }, + { "//c[@type]/ancestor-or-self::node()[1]", "E3.E2.E2.D1" }, + { "//c[@type]/attribute::node()[1]", "A'type'.E3.E2.E2.D1" }, + { "//c[@type]/child::node()[1]", "T1.E3.E2.E2.D1" }, + { "//c[@type]/descendant::node()[1]", "T1.E3.E2.E2.D1" }, + { "//c[@type]/descendant-or-self::node()[1]", "E3.E2.E2.D1" }, + { "//c[@type]/following::node()[1]", "E4.E2.E2.D1" }, + { "//c[@type]/following-sibling::node()[1]", "E4.E2.E2.D1" }, + { "//c[@type]/parent::node()[1]", "E2.E2.D1" }, + { "//c[@type]/preceding::node()[1]", "T1.E2.E2.E2.D1" }, + { "//c[@type]/self::node()[1]", "E3.E2.E2.D1" }, + { "child::*", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "child::text()", "" }, + { "child::*/..", "E2.D1" }, + { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, + { "self::node()", "E2.D1" }, + { "ancestor::node()", "D1" }, + { "elem[c][last()]/a", "E1.E2.E2.D1"}, + { "ancestor-or-self::node()[1]", "E2.D1" }, + { "((//a)[1])[last()]", "E1.E1.E2.D1" }, + { NULL } +}; + static void test_XPath(void) { const selection_ns_t *ptr = selection_ns_data; + const xpath_test_t *xptest = xpath_test; VARIANT var; VARIANT_BOOL b; IXMLDOMDocument2 *doc; @@ -4348,6 +4481,26 @@ hr = IXMLDOMNodeList_reset(list); EXPECT_HR(hr, S_OK); expect_list_and_release(list, "E2.D1"); + + /* peform xpath tests */ + for ( ; xptest->query ; xptest++ ) + { + char *str; + + hr = IXMLDOMNode_selectNodes(rootNode, _bstr_(xptest->query), &list); + ok(hr == S_OK, "query evaluation failed for query=%s\n", xptest->query); + + if (hr != S_OK) + continue; + + str = list_to_string(list); + + ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", + xptest->query, str, xptest->list); + + if (list) + IXMLDOMNodeList_Release(list); + } if (0) { @@ -11475,6 +11628,99 @@ free_bstrs(); } +struct attrtest_t { + const char *name; + const char *uri; + const char *prefix; + const char *href; +}; + +static struct attrtest_t attrtests[] = { + { "xmlns", "http://www.w3.org/2000/xmlns/", "xmlns", "xmlns" }, + { "xmlns", "nondefaulturi", "xmlns", "xmlns" }, + { "c", "http://www.w3.org/2000/xmlns/", NULL, "http://www.w3.org/2000/xmlns/" }, + { "c", "nsref1", NULL, "nsref1" }, + { "ns:c", "nsref1", "ns", "nsref1" }, + { "xmlns:c", "http://www.w3.org/2000/xmlns/", "xmlns", "" }, + { "xmlns:c", "nondefaulturi", "xmlns", "" }, + { 0 } +}; + +static void test_create_attribute(void) +{ + struct attrtest_t *ptr = attrtests; + IXMLDOMElement *el; + IXMLDOMDocument *doc; + IXMLDOMNode *node, *node2; + VARIANT var; + HRESULT hr; + int i = 0; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + while (ptr->name) + { + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_(ptr->name), _bstr_(ptr->uri), &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_prefix(node, &str); + if (ptr->prefix) + { + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->prefix)), "%d: got prefix %s, expected %s\n", i, wine_dbgstr_w(str), ptr->prefix); + } + else + { + ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr); + ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); + } + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->href)), "%d: got uri %s, expected %s\n", i, wine_dbgstr_w(str), ptr->href); + SysFreeString(str); + + IXMLDOMNode_Release(node); + free_bstrs(); + + i++; + ptr++; + } + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("e"), NULL, &node2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&el); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node2); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("xmlns:a"), _bstr_("http://www.w3.org/2000/xmlns/"), &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_setAttributeNode(el, (IXMLDOMAttribute*)node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* for some reason default namespace uri is not reported */ + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, _bstr_("")), "got uri %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMElement_Release(el); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -11531,6 +11777,7 @@ test_setAttributeNode(); test_put_dataType(); test_createNode(); + test_create_attribute(); test_get_prefix(); test_default_properties(); test_selectSingleNode(); Modified: trunk/rostests/winetests/msxml3/httpreq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/httpreq.… ============================================================================== --- trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] Mon Sep 23 11:39:45 2013 @@ -1443,12 +1443,6 @@ HRESULT hr; HGLOBAL g; - if (!winetest_interactive) - { - skip("test_XMLHTTP skipped, ROSTESTS-100\n"); - return; - } - xhr = create_xhr(); VariantInit(&dummy); @@ -1699,58 +1693,28 @@ IDispatch_Release(event); /* interaction with object site */ - EXPECT_REF(xhr, 1); hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); EXPECT_HR(hr, S_OK); -todo_wine { - EXPECT_REF(xhr, 1); - EXPECT_REF(obj_site, 1); -} hr = IObjectWithSite_SetSite(obj_site, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - IObjectWithSite_AddRef(obj_site); -todo_wine { - EXPECT_REF(obj_site, 2); - EXPECT_REF(xhr, 1); -} - IObjectWithSite_Release(obj_site); - hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site2); EXPECT_HR(hr, S_OK); -todo_wine { - EXPECT_REF(xhr, 1); - EXPECT_REF(obj_site, 1); - EXPECT_REF(obj_site2, 1); - ok(obj_site != obj_site2, "expected new instance\n"); -} - IObjectWithSite_Release(obj_site); + ok(obj_site == obj_site2 || broken(obj_site != obj_site2), "got new instance\n"); + IObjectWithSite_Release(obj_site2); set_xhr_site(xhr); /* try to set site another time */ - - /* to be removed once IObjectWithSite is properly separated */ SET_EXPECT(site_qi_IServiceProvider); SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - hr = IObjectWithSite_SetSite(obj_site2, &testsite); - EXPECT_HR(hr, S_OK); - - todo_wine EXPECT_REF(xhr, 1); + hr = IObjectWithSite_SetSite(obj_site, &testsite); + EXPECT_HR(hr, S_OK); + + IObjectWithSite_Release(obj_site); IXMLHttpRequest_Release(xhr); - - /* still works after request is released */ - - /* to be removed once IObjectWithSite is properly separated */ - SET_EXPECT(site_qi_IServiceProvider); - SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - - hr = IObjectWithSite_SetSite(obj_site2, &testsite); - EXPECT_HR(hr, S_OK); - IObjectWithSite_Release(obj_site2); - free_bstrs(); } Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Mon Sep 23 11:39:45 2013 @@ -39,6 +39,7 @@ //#include "ocidl.h" #include <dispex.h> +static const WCHAR emptyW[] = {0}; #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -891,10 +892,10 @@ /* attribute value normalization test */ static const char attribute_normalize[] = "<?xml version=\"1.0\" ?>\n" - "<a attr1=\" \r \n \tattr_value A \t \r \n\r\n \n\"/>\n"; + "<a attr1=\" \r \n \tattr_value A & &\t \r \n\r\n \n\"/>\n"; static struct attribute_entry attribute_norm_attrs[] = { - { "", "attr1", "attr1", " attr_value A " }, + { "", "attr1", "attr1", " attr_value A & & " }, { NULL } }; @@ -1556,8 +1557,8 @@ { static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0}, {'a','2','j','u','n','k',0}, - {'<','&','"','>',0}}; - static const int attrvalueslen[] = {2, 2, 4}; + {'<','&','"','>','\'',0}}; + static const int attrvalueslen[] = {2, 2, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -2895,7 +2896,6 @@ static void test_mxwriter_properties(void) { static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; - static const WCHAR emptyW[] = {0}; static const WCHAR testW[] = {'t','e','s','t',0}; ISAXContentHandler *content; IMXWriter *writer; @@ -3046,7 +3046,6 @@ static void test_mxwriter_flush(void) { - static const WCHAR emptyW[] = {0}; ISAXContentHandler *content; IMXWriter *writer; LARGE_INTEGER pos; @@ -3336,9 +3335,9 @@ ISAXAttributes *attr; }; -static const char startelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\">"; -static const char startendelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\"/>"; -static const char startendelement_noescape_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&\">\"/>"; +static const char startelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\'\">"; +static const char startendelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\'\"/>"; +static const char startendelement_noescape_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&\">\'\"/>"; static const struct writer_startendelement_t writer_startendelement[] = { /* 0 */ @@ -3717,7 +3716,8 @@ ok(!lstrcmpW(_bstr_("<abc>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); - ISAXContentHandler_endDocument(content); + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); IMXWriter_flush(writer); hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("abdcdef"), 3); @@ -3755,10 +3755,10 @@ }; static const struct writer_characters_t writer_characters[] = { - { &CLSID_MXXMLWriter, "< > & \"", "< > & \"" }, - { &CLSID_MXXMLWriter30, "< > & \"", "< > & \"" }, - { &CLSID_MXXMLWriter40, "< > & \"", "< > & \"" }, - { &CLSID_MXXMLWriter60, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter, "< > & \" \'", "< > & \" \'" }, + { &CLSID_MXXMLWriter30, "< > & \" \'", "< > & \" \'" }, + { &CLSID_MXXMLWriter40, "< > & \" \'", "< > & \" \'" }, + { &CLSID_MXXMLWriter60, "< > & \" \'", "< > & \" \'" }, { NULL } }; @@ -4743,6 +4743,28 @@ ok(!lstrcmpW(_bstr_("<!ENTITY name \"value\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* external entities */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, NULL, 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), -1, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), + _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ENTITY name PUBLIC \"pubid\" \"sysid\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); ISAXDeclHandler_Release(decl); @@ -5247,6 +5269,63 @@ ISAXAttributes_Release(saxattr); IMXAttributes_Release(mxattr); } +} + +static void test_mxwriter_indent(void) +{ + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMXWriter_put_indent(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, _bstr_(""), 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("b"), -1, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("c"), -1, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("c"), -1); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("b"), -1); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n<a><b>\r\n\t\t<c/>\r\n\t</b>\r\n</a>"), V_BSTR(&dest)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); } START_TEST(saxreader) @@ -5296,6 +5375,7 @@ test_mxwriter_stream(); test_mxwriter_encoding(); test_mxwriter_dispex(); + test_mxwriter_indent(); } else win_skip("MXXMLWriter not supported\n");

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