Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60346: [POWRPROF_APITEST] * Fix GCC warnings. * Enable -Werror again. * Speedup linking.

by akhaldi＠svn.reactos.org

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; }

11 years, 3 months

[hbelusca] 60345: [BUGCODES] Introduce the DRIVER_UNMAPPING_INVALID_VIEW bugcheck code and use it.

by hbelusca＠svn.reactos.org

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,

11 years, 3 months

[aandrejevic] 60344: [SOFT386] Implement the IMUL instruction. Both versions have been implemented in Soft386OpcodeImulModrm.

by aandrejevic＠svn.reactos.org

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);

11 years, 3 months

[akhaldi] 60343: [CMAKE/MSVC] * Drop /link from executable link lines.

by akhaldi＠svn.reactos.org

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}")

11 years, 3 months

[aandrejevic] 60342: [SOFT386] Implement the AAM and AAD instructions.

by aandrejevic＠svn.reactos.org

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)

11 years, 3 months

[aandrejevic] 60341: [SOFT386] Implement the POPF instruction.

by aandrejevic＠svn.reactos.org

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)

11 years, 3 months

[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

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");

11 years, 3 months

[akhaldi] 60339: [MSXML3] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 23 11:38:27 2013 New Revision: 60339 URL: http://svn.reactos.org/svn/reactos?rev=60339&view=rev Log: [MSXML3] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/docfrag.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/entityref.c trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/mxwriter.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x601) add_definitions( -D__WINESRC__ @@ -13,9 +10,7 @@ endif() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msxml3.dll msxml3.spec ADD_IMPORTLIB) - add_typelib(msxml3_v1.idl) list(APPEND SOURCE @@ -56,24 +51,17 @@ ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def) +list(APPEND msxml3_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/msxml3.manifest + ${CMAKE_CURRENT_SOURCE_DIR}/msxml3_v1.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/xmlparser.rgs + ${CMAKE_CURRENT_BINARY_DIR}/msxml3_v1.tlb) + +set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_deps}") add_library(msxml3 SHARED ${SOURCE} version.rc) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(msxml3) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_idl_headers(xmlparser_idlheader xmlparser.idl) -add_dependencies(msxml3 xmlparser_idlheader) - set_module_type(msxml3 win32dll) -set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml3_v1.tlb) -target_link_libraries(msxml3 libxml2 uuid wine wineldr) - -add_importlibs(msxml3 urlmon wininet ws2_32 comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 msvcrt kernel32 ntdll) - -# msxml3_v1.tlb needs stdole2.tlb -add_dependencies(msxml3 stdole2) - +target_link_libraries(msxml3 libxml2 uuid wine) +add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll) +add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… ============================================================================== --- trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -46,6 +46,8 @@ #ifdef HAVE_LIBXML2 +static const xmlChar xmlns[] = "xmlns"; + typedef struct _domattr { xmlnode node; @@ -56,7 +58,7 @@ static const tid_t domattr_se_tids[] = { IXMLDOMNode_tid, IXMLDOMAttribute_tid, - 0 + NULL_tid }; static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface ) @@ -545,8 +547,29 @@ BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); + xmlNsPtr ns = This->node.node->ns; + TRACE("(%p)->(%p)\n", This, p); - return node_get_namespaceURI(&This->node, p); + + if (!p) + return E_INVALIDARG; + + *p = NULL; + + if (ns) + { + /* special case for default namespace definition */ + if (xmlStrEqual(This->node.node->name, xmlns)) + *p = bstr_from_xmlChar(xmlns); + else if (xmlStrEqual(ns->prefix, xmlns)) + *p = SysAllocStringLen(NULL, 0); + else if (ns->href) + *p = bstr_from_xmlChar(ns->href); + } + + TRACE("uri: %s\n", debugstr_w(*p)); + + return *p ? S_OK : S_FALSE; } static HRESULT WINAPI domattr_get_prefix( @@ -554,8 +577,26 @@ BSTR* prefix) { domattr *This = impl_from_IXMLDOMAttribute( iface ); + xmlNsPtr ns = This->node.node->ns; + TRACE("(%p)->(%p)\n", This, prefix); - return node_get_prefix( &This->node, prefix ); + + if (!prefix) return E_INVALIDARG; + + *prefix = NULL; + + if (ns) + { + /* special case for default namespace definition */ + if (xmlStrEqual(This->node.node->name, xmlns)) + *prefix = bstr_from_xmlChar(xmlns); + else if (ns->prefix) + *prefix = bstr_from_xmlChar(ns->prefix); + } + + TRACE("prefix: %s\n", debugstr_w(*prefix)); + + return *prefix ? S_OK : S_FALSE; } static HRESULT WINAPI domattr_get_baseName( Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -55,7 +55,7 @@ static const tid_t domcdata_se_tids[] = { IXMLDOMNode_tid, IXMLDOMCDATASection_tid, - 0 + NULL_tid }; static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) @@ -336,7 +336,7 @@ { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcdata_get_ownerDocument( Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -55,7 +55,7 @@ static const tid_t domcomment_se_tids[] = { IXMLDOMNode_tid, IXMLDOMComment_tid, - 0 + NULL_tid }; static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface ) @@ -335,7 +335,7 @@ { domcomment *This = impl_from_IXMLDOMComment( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcomment_get_ownerDocument( Modified: trunk/reactos/dll/win32/msxml3/docfrag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/docfrag.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -55,7 +55,7 @@ static const tid_t domfrag_se_tids[] = { IXMLDOMNode_tid, IXMLDOMDocumentFragment_tid, - 0 + NULL_tid }; static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface ) Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -419,10 +419,26 @@ if (ctxt->node) { - /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ + xmlChar cur = *(ctxt->input->cur); + + /* Characters are reported with multiple calls, for example each charref is reported with a separate + call and then parser appends it to a single text node or creates a new node if not created. + It's not possible to tell if it's ignorable data or not just looking at data itself cause it could be + space chars that separate charrefs or similar case. We only need to skip leading and trailing spaces, + or whole node if it has nothing but space chars, so to detect leading space node->last is checked that + contains text node pointer if already created, trailing spaces are detected directly looking at parser input + for next '<' opening bracket - similar logic is used by libxml2 itself. Basically 'cur' == '<' means the last + chunk of char data, in case it's not the last chunk we check for previously added node type and if it's not + a text node it's safe to ignore. + + Note that during domdoc_loadXML() the xmlDocPtr->_private data is not available. */ + if (!This->properties->preserving && !is_preserving_whitespace(ctxt->node) && - strn_isspace(ch, len)) + strn_isspace(ch, len) && + (!ctxt->node->last || + ((ctxt->node->last && (cur == '<' || ctxt->node->last->type != XML_TEXT_NODE)) + ))) return; } @@ -852,7 +868,7 @@ IXMLDOMDocument_tid, IXMLDOMDocument2_tid, IXMLDOMDocument3_tid, - 0 + NULL_tid }; static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID riid, void** ppvObject ) @@ -1921,9 +1937,6 @@ hr = get_node_type(Type, &node_type); if(FAILED(hr)) return hr; - if(namespaceURI && namespaceURI[0] && node_type != NODE_ELEMENT) - FIXME("nodes with namespaces currently not supported.\n"); - TRACE("node_type %d\n", node_type); /* exit earlier for types that need name */ @@ -1966,8 +1979,26 @@ break; } case NODE_ATTRIBUTE: - xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), xml_name, NULL); + { + xmlChar *local, *prefix; + + local = xmlSplitQName2(xml_name, &prefix); + + xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), local ? local : xml_name, NULL); + + if (local || (href && *href)) + { + /* we need a floating namespace here, it can't be created linked to attribute from + a start */ + xmlNsPtr ns = xmlNewNs(NULL, href, prefix); + xmlSetNs(xmlnode, ns); + } + + xmlFree(local); + xmlFree(prefix); + break; + } case NODE_TEXT: xmlnode = (xmlNodePtr)xmlNewDocText(get_doc(This), NULL); break; @@ -2984,7 +3015,7 @@ lstrcmpiW(p, PropertyResolveExternalsW) == 0) { /* Ignore */ - FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&value)); + FIXME("Ignoring property %s, value %s\n", debugstr_w(p), debugstr_variant(&value)); return S_OK; } Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -61,7 +61,7 @@ static const tid_t domelem_se_tids[] = { IXMLDOMNode_tid, IXMLDOMElement_tid, - 0 + NULL_tid }; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) Modified: trunk/reactos/dll/win32/msxml3/entityref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/entityref… ============================================================================== --- trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -55,7 +55,7 @@ static const tid_t domentityref_se_tids[] = { IXMLDOMNode_tid, IXMLDOMEntityReference_tid, - 0 + NULL_tid }; static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… ============================================================================== --- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -622,8 +622,27 @@ HWND *hwnd, LPWSTR *username, LPWSTR *password) { BindStatusCallback *This = impl_from_IAuthenticate(iface); - FIXME("(%p)->(%p %p %p)\n", This, hwnd, username, password); - return E_NOTIMPL; + httprequest *request = This->request; + + TRACE("(%p)->(%p %p %p)\n", This, hwnd, username, password); + + if (request->user && *request->user) + { + if (hwnd) *hwnd = NULL; + *username = CoTaskMemAlloc(SysStringByteLen(request->user)+sizeof(WCHAR)); + *password = CoTaskMemAlloc(SysStringByteLen(request->password)+sizeof(WCHAR)); + if (!*username || !*password) + { + CoTaskMemFree(*username); + CoTaskMemFree(*password); + return E_OUTOFMEMORY; + } + + memcpy(*username, request->user, SysStringByteLen(request->user)+sizeof(WCHAR)); + memcpy(*password, request->password, SysStringByteLen(request->password)+sizeof(WCHAR)); + } + + return S_OK; } static const IAuthenticateVtbl AuthenticateVtbl = { @@ -706,7 +725,7 @@ heap_free(bsc); return hr; } - if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) + if ((hr = SafeArrayGetUBound(sa, 1, &size)) != S_OK) { SafeArrayUnaccessData(sa); heap_free(bsc); @@ -720,26 +739,30 @@ /* fall through */ case VT_EMPTY: case VT_ERROR: + case VT_NULL: ptr = NULL; size = 0; break; } - bsc->body = GlobalAlloc(GMEM_FIXED, size); - if (!bsc->body) + if (size) { - if (V_VT(body) == VT_BSTR) - heap_free(ptr); - else if (V_VT(body) == (VT_ARRAY|VT_UI1)) - SafeArrayUnaccessData(sa); - - heap_free(bsc); - return E_OUTOFMEMORY; + bsc->body = GlobalAlloc(GMEM_FIXED, size); + if (!bsc->body) + { + if (V_VT(body) == VT_BSTR) + heap_free(ptr); + else if (V_VT(body) == (VT_ARRAY|VT_UI1)) + SafeArrayUnaccessData(sa); + + heap_free(bsc); + return E_OUTOFMEMORY; + } + + send_data = GlobalLock(bsc->body); + memcpy(send_data, ptr, size); + GlobalUnlock(bsc->body); } - - send_data = GlobalLock(bsc->body); - memcpy(send_data, ptr, size); - GlobalUnlock(bsc->body); if (V_VT(body) == VT_BSTR) heap_free(ptr); @@ -885,12 +908,6 @@ return hr; } - This->uri = uri; - - VariantInit(&is_async); - hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); - This->async = hr == S_OK && V_BOOL(&is_async); - VariantInit(&str); hr = VariantChangeType(&str, &user, 0, VT_BSTR); if (hr == S_OK) @@ -900,6 +917,38 @@ hr = VariantChangeType(&str, &password, 0, VT_BSTR); if (hr == S_OK) This->password = V_BSTR(&str); + + /* add authentication info */ + if (This->user && *This->user) + { + IUriBuilder *builder; + + hr = CreateIUriBuilder(uri, 0, 0, &builder); + if (hr == S_OK) + { + IUri *full_uri; + + IUriBuilder_SetUserName(builder, This->user); + IUriBuilder_SetPassword(builder, This->password); + hr = IUriBuilder_CreateUri(builder, -1, 0, 0, &full_uri); + if (hr == S_OK) + { + IUri_Release(uri); + uri = full_uri; + } + else + WARN("failed to create modified uri, 0x%08x\n", hr); + IUriBuilder_Release(builder); + } + else + WARN("IUriBuilder creation failed, 0x%08x\n", hr); + } + + This->uri = uri; + + VariantInit(&is_async); + hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); + This->async = hr == S_OK && V_BOOL(&is_async); httprequest_setreadystate(This, READYSTATE_LOADING); Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -212,7 +212,7 @@ #endif } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; @@ -243,7 +243,6 @@ { pxsltCleanupGlobals(); wine_dlclose(libxslt_handle, NULL, 0); - libxslt_handle = NULL; } #endif #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -475,6 +475,15 @@ return S_FALSE; } +static inline HRESULT return_var_false(VARIANT_BOOL *p) +{ + if(!p) + return E_INVALIDARG; + + *p = VARIANT_FALSE; + return S_FALSE; +} + extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) DECLSPEC_HIDDEN; extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/msxml3/mxwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxwriter.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -1,7 +1,7 @@ /* * MXWriter implementation * - * Copyright 2011-2012 Nikolay Sivov for CodeWeavers + * Copyright 2011-2013 Nikolay Sivov for CodeWeavers * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or @@ -46,6 +46,8 @@ static const WCHAR spaceW[] = {' '}; static const WCHAR quotW[] = {'\"'}; static const WCHAR closetagW[] = {'>','\r','\n'}; +static const WCHAR crlfW[] = {'\r','\n'}; +static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; /* should be ordered as encoding names are sorted */ typedef enum @@ -148,6 +150,10 @@ VARIANT_BOOL props[MXWriter_LastProp]; BOOL prop_changed; BOOL cdata; + + BOOL text; /* last node was text node, so we shouldn't indent next node */ + BOOL newline; /* newline was already added as a part of previous call */ + UINT indent; /* indentation level for next node */ BSTR version; @@ -457,14 +463,13 @@ return ret; } -static void write_prolog_buffer(const mxwriter *This) +static void write_prolog_buffer(mxwriter *This) { static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','='}; static const WCHAR encodingW[] = {' ','e','n','c','o','d','i','n','g','=','\"'}; static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; static const WCHAR noW[] = {'n','o','\"','?','>'}; - static const WCHAR crlfW[] = {'\r','\n'}; /* version */ write_output_buffer(This->buffer, versionW, sizeof(versionW)/sizeof(WCHAR)); @@ -486,6 +491,7 @@ write_output_buffer(This->buffer, noW, sizeof(noW)/sizeof(WCHAR)); write_output_buffer(This->buffer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); + This->newline = TRUE; } /* Attempts to the write data from the mxwriter's buffer to @@ -537,6 +543,41 @@ static const WCHAR gtW[] = {'>'}; if (!This->element) return; write_output_buffer(This->buffer, gtW, 1); +} + +static void write_node_indent(mxwriter *This) +{ + static const WCHAR tabW[] = {'\t'}; + int indent = This->indent; + + if (!This->props[MXWriter_Indent] || This->text) + { + This->text = FALSE; + return; + } + + /* This is to workaround PI output logic that always puts newline chars, + document prolog PI does that too. */ + if (!This->newline) + write_output_buffer(This->buffer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); + while (indent--) + write_output_buffer(This->buffer, tabW, 1); + + This->newline = FALSE; + This->text = FALSE; +} + +static inline void writer_inc_indent(mxwriter *This) +{ + This->indent++; +} + +static inline void writer_dec_indent(mxwriter *This) +{ + if (This->indent) This->indent--; + /* depth is decreased only when element is closed, meaning it's not a text node + at this point */ + This->text = FALSE; } static void set_element_name(mxwriter *This, const WCHAR *name, int len) @@ -1085,8 +1126,11 @@ set_element_name(This, QName ? QName : emptyW, QName ? nQName : 0); + write_node_indent(This); + write_output_buffer(This->buffer, ltW, 1); write_output_buffer(This->buffer, QName, nQName); + writer_inc_indent(This); if (attr) { @@ -1150,6 +1194,8 @@ (nQName == -1 && This->class_version == MSXML6)) return E_INVALIDARG; + writer_dec_indent(This); + if (This->element) { static const WCHAR closeW[] = {'/','>'}; @@ -1160,6 +1206,7 @@ static const WCHAR closetagW[] = {'<','/'}; static const WCHAR gtW[] = {'>'}; + write_node_indent(This); write_output_buffer(This->buffer, closetagW, 2); write_output_buffer(This->buffer, QName, nQName); write_output_buffer(This->buffer, gtW, 1); @@ -1183,6 +1230,9 @@ close_element_starttag(This); set_element_name(This, NULL, 0); + + if (!This->cdata) + This->text = TRUE; if (nchars) { @@ -1233,6 +1283,7 @@ if (!target) return E_INVALIDARG; + write_node_indent(This); write_output_buffer(This->buffer, openpiW, sizeof(openpiW)/sizeof(WCHAR)); if (*target) @@ -1245,6 +1296,7 @@ } write_output_buffer(This->buffer, closepiW, sizeof(closepiW)/sizeof(WCHAR)); + This->newline = TRUE; return S_OK; } @@ -1384,6 +1436,7 @@ TRACE("(%p)\n", This); + write_node_indent(This); write_output_buffer(This->buffer, scdataW, sizeof(scdataW)/sizeof(WCHAR)); This->cdata = TRUE; @@ -1414,6 +1467,7 @@ if (!chars) return E_INVALIDARG; close_element_starttag(This); + write_node_indent(This); write_output_buffer(This->buffer, copenW, sizeof(copenW)/sizeof(WCHAR)); if (nchars) @@ -1526,7 +1580,6 @@ const WCHAR *name, int n_name, const WCHAR *value, int n_value) { mxwriter *This = impl_from_ISAXDeclHandler( iface ); - static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; TRACE("(%p)->(%s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(value, n_value), n_value); @@ -1551,10 +1604,39 @@ const WCHAR *name, int n_name, const WCHAR *publicId, int n_publicId, const WCHAR *systemId, int n_systemId) { + static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; + static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; mxwriter *This = impl_from_ISAXDeclHandler( iface ); - FIXME("(%p)->(%s:%d %s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + + TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(publicId, n_publicId), n_publicId, debugstr_wn(systemId, n_systemId), n_systemId); - return E_NOTIMPL; + + if (!name) return E_INVALIDARG; + if (publicId && !systemId) return E_INVALIDARG; + if (!publicId && !systemId) return E_INVALIDARG; + + write_output_buffer(This->buffer, entityW, sizeof(entityW)/sizeof(WCHAR)); + if (n_name) { + write_output_buffer(This->buffer, name, n_name); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (publicId) + { + write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer_quoted(This->buffer, publicId, n_publicId); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer_quoted(This->buffer, systemId, n_systemId); + } + else + { + write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer_quoted(This->buffer, systemId, n_systemId); + } + + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + + return S_OK; } static const ISAXDeclHandlerVtbl SAXDeclHandlerVtbl = { @@ -1612,6 +1694,9 @@ This->element = NULL; This->cdata = FALSE; + This->indent = 0; + This->text = FALSE; + This->newline = FALSE; This->dest = NULL; This->dest_written = 0; @@ -1806,11 +1891,32 @@ return S_OK; } +static mxattribute *get_attribute_byindex(mxattributes *attrs, int index) +{ + if (index < 0 || index >= attrs->length) return NULL; + return &attrs->attr[index]; +} + static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d): stub\n", This, index); - return E_NOTIMPL; + mxattribute *dst; + + TRACE("(%p)->(%d)\n", This, index); + + if (!(dst = get_attribute_byindex(This, index))) return E_INVALIDARG; + + /* no need to remove last attribute, just make it inaccessible */ + if (index + 1 == This->length) + { + This->length--; + return S_OK; + } + + memmove(dst, dst + 1, (This->length-index-1)*sizeof(*dst)); + This->length--; + + return S_OK; } static HRESULT WINAPI MXAttributes_setAttribute(IMXAttributes *iface, int index, @@ -1833,29 +1939,61 @@ BSTR localName) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(localName)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(localName)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->local); + attr->local = SysAllocString(localName); + + return S_OK; } static HRESULT WINAPI MXAttributes_setQName(IMXAttributes *iface, int index, BSTR QName) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(QName)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(QName)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->qname); + attr->qname = SysAllocString(QName); + + return S_OK; } static HRESULT WINAPI MXAttributes_setURI(IMXAttributes *iface, int index, BSTR uri) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(uri)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(uri)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->uri); + attr->uri = SysAllocString(uri); + + return S_OK; } static HRESULT WINAPI MXAttributes_setValue(IMXAttributes *iface, int index, BSTR value) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(value)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(value)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->value); + attr->value = SysAllocString(value); + + return S_OK; } static const IMXAttributesVtbl MXAttributesVtbl = { Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -153,7 +153,7 @@ TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); tid = This->iids; - while (*tid) + while (*tid != NULL_tid) { if (IsEqualGUID(riid, get_riid_from_tid(*tid))) return S_OK; @@ -899,6 +899,50 @@ return *ret ? S_OK : E_OUTOFMEMORY; } +/* duplicates xmlBufferWriteQuotedString() logic */ +static void xml_write_quotedstring(xmlOutputBufferPtr buf, const xmlChar *string) +{ + const xmlChar *cur, *base; + + if (xmlStrchr(string, '\"')) + { + if (xmlStrchr(string, '\'')) + { + xmlOutputBufferWrite(buf, 1, "\""); + base = cur = string; + + while (*cur) + { + if (*cur == '"') + { + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 6, """); + cur++; + base = cur; + } + else + cur++; + } + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 1, "\""); + } + else + { + xmlOutputBufferWrite(buf, 1, "\'"); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\'"); + } + } + else + { + xmlOutputBufferWrite(buf, 1, "\""); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\""); + } +} + static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) { xmlDtdPtr cur = doc->intSubset; @@ -908,17 +952,17 @@ if (cur->ExternalID) { xmlOutputBufferWriteString(buf, " PUBLIC "); - xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + xml_write_quotedstring(buf, cur->ExternalID); if (cur->SystemID) { xmlOutputBufferWriteString(buf, " "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } } else if (cur->SystemID) { xmlOutputBufferWriteString(buf, " SYSTEM "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } xmlOutputBufferWriteString(buf, ">\n"); } @@ -946,6 +990,15 @@ doc->type = type; } +static const xmlChar *get_output_buffer_content(xmlOutputBufferPtr output) +{ +#ifdef LIBXML2_NEW_BUFFER + return xmlOutputBufferGetContent(output); +#else + return xmlBufferContent(output->buffer); +#endif +} + HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) { #ifdef SONAME_LIBXSLT @@ -974,7 +1027,7 @@ if (output) { htmldoc_dumpcontent(output, result->doc); - content = xmlBufferContent(output->buffer); + content = get_output_buffer_content(output); *p = bstr_from_xmlChar(content); xmlOutputBufferClose(output); } Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -57,7 +57,7 @@ static const tid_t dompi_se_tids[] = { IXMLDOMNode_tid, IXMLDOMProcessingInstruction_tid, - 0 + NULL_tid }; static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface ) Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -1268,6 +1268,49 @@ isaxattributes_getValueFromQName }; +/* Libxml2 escapes '&' back to char reference '&' in attribute value, + so when document has escaped value with '&' it's parsed to '&' and then + escaped to '&'. This function takes care of ampersands only. */ +static BSTR saxreader_get_unescaped_value(const xmlChar *buf, int len) +{ + static const WCHAR ampescW[] = {'&','#','3','8',';',0}; + WCHAR *dest, *ptrW, *str; + DWORD str_len; + BSTR bstr; + + if (!buf) + return NULL; + + str_len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); + if (len != -1) str_len++; + + str = heap_alloc(str_len*sizeof(WCHAR)); + if (!str) return NULL; + + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, str_len); + if (len != -1) str[str_len-1] = 0; + + ptrW = str; + while ((dest = strstrW(ptrW, ampescW))) + { + WCHAR *src; + + /* leave first '&' from a reference as a value */ + src = dest + (sizeof(ampescW)/sizeof(WCHAR) - 1); + dest++; + + /* move together with null terminator */ + memmove(dest, src, (strlenW(src) + 1)*sizeof(WCHAR)); + + ptrW++; + } + + bstr = SysAllocString(str); + heap_free(str); + + return bstr; +} + static HRESULT SAXAttributes_populate(saxlocator *locator, int nb_namespaces, const xmlChar **xmlNamespaces, int nb_attributes, const xmlChar **xmlAttributes) @@ -1320,8 +1363,7 @@ attrs[i].szURI = find_element_uri(locator, xmlAttributes[i*5+2]); attrs[i].szLocalname = bstr_from_xmlChar(xmlAttributes[i*5]); - attrs[i].szValue = bstr_from_xmlCharN(xmlAttributes[i*5+3], - xmlAttributes[i*5+4]-xmlAttributes[i*5+3]); + attrs[i].szValue = saxreader_get_unescaped_value(xmlAttributes[i*5+3], xmlAttributes[i*5+4]-xmlAttributes[i*5+3]); attrs[i].szQName = QName_from_xmlChar(xmlAttributes[i*5+1], xmlAttributes[i*5]); } Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -333,7 +333,7 @@ { domtext *This = impl_from_IXMLDOMText( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domtext_get_ownerDocument( Modified: trunk/reactos/dll/win32/msxml3/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/version.r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/version.rc [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -22,7 +22,7 @@ #define WINE_PRODUCTVERSION_STR "8.90.1101.0" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc> /* @makedep: msxml3.manifest */ WINE_MANIFEST 24 msxml3.manifest Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 23 11:38:27 2013 @@ -132,7 +132,7 @@ reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 reactos/dll/win32/msxml # Synced to Wine-1.5.19 reactos/dll/win32/msxml2 # Synced to Wine-1.5.19 -reactos/dll/win32/msxml3 # Synced to Wine-1.5.26 +reactos/dll/win32/msxml3 # Synced to Wine-1.7.1 reactos/dll/win32/msxml4 # Synced to Wine-1.5.19 reactos/dll/win32/msxml6 # Synced to Wine-1.5.19 reactos/dll/win32/nddeapi # Synced to Wine-1.5.19

11 years, 3 months

[akhaldi] 60338: [MSVIDC32] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 23 11:37:25 2013 New Revision: 60338 URL: http://svn.reactos.org/svn/reactos?rev=60338&view=rev Log: [MSVIDC32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msvidc32/CMakeLists.txt trunk/reactos/dll/win32/msvidc32/msvideo1.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:37:25 2013 @@ -1,19 +1,16 @@ - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions( -D__WINESRC__ -D_WINE) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(msvidc32.dll msvidc32.spec) list(APPEND SOURCE msvideo1.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def) -add_library(msvidc32 SHARED ${SOURCE}) - +add_library(msvidc32 SHARED ${SOURCE} rsrc.rc) set_module_type(msvidc32 win32dll) target_link_libraries(msvidc32 wine) add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo… ============================================================================== --- trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] Mon Sep 23 11:37:25 2013 @@ -312,26 +312,26 @@ if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != WHAM_MAGIC ) ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( ( in->bmiHeader.biBitCount != 16 ) && ( in->bmiHeader.biBitCount != 8 ) ) { TRACE("can't do %d bpp\n", in->bmiHeader.biBitCount ); - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } /* output must be same dimensions as input */ if( out ) { if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } TRACE("OK!\n"); @@ -584,9 +584,6 @@ DisableThreadLibraryCalls(hModule); MSVIDC32_hModule = hModule; break; - - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 23 11:37:25 2013 @@ -129,7 +129,7 @@ reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 -reactos/dll/win32/msvidc32 # Autosync +reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 reactos/dll/win32/msxml # Synced to Wine-1.5.19 reactos/dll/win32/msxml2 # Synced to Wine-1.5.19 reactos/dll/win32/msxml3 # Synced to Wine-1.5.26

11 years, 3 months

[akhaldi] 60337: [MSVFW32_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 23 11:36:35 2013 New Revision: 60337 URL: http://svn.reactos.org/svn/reactos?rev=60337&view=rev Log: [MSVFW32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/msvfw32/CMakeLists.txt trunk/rostests/winetests/msvfw32/msvfw.c trunk/rostests/winetests/msvfw32/testlist.c Modified: trunk/rostests/winetests/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:36:35 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(msvfw32_winetest msvfw.c testlist.c) -target_link_libraries(msvfw32_winetest wine) set_module_type(msvfw32_winetest win32cui) -add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32 ntdll) +add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32) add_cd_file(TARGET msvfw32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msvfw32/msvfw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/msvfw.c… ============================================================================== --- trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] Mon Sep 23 11:36:35 2013 @@ -1,7 +1,7 @@ /* * Unit tests for video playback * - * Copyright 2008 JÃ¶rg HÃ¶hle + * Copyright 2008,2010 JÃ¶rg HÃ¶hle * Copyright 2008 Austin English * * This library is free software; you can redistribute it and/or @@ -63,7 +63,145 @@ } } +static void test_Locate(void) +{ + static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8, 0,100000,100000, 0,0}; + static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB, 0,100000,100000, 0,0}; + HIC h; + DWORD err; + + /* Oddly, MSDN documents that ICLocate takes BITMAPINFOHEADER + * pointers, while ICDecompressQuery takes the larger + * BITMAPINFO. Probably it's all the same as long as the + * variable length color quads are present when they are + * needed. */ + + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "RLE8->RGB failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "RLE8->RGB height<0 succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bi.biCompression = mmioFOURCC('c','v','i','d'); /* Cinepak */ + h = ICOpen(ICTYPE_VIDEO, mmioFOURCC('c','v','i','d'), ICMODE_DECOMPRESS); + if (h == 0) win_skip("Cinepak/ICCVID codec not found\n"); + else { + bo.biBitCount = bi.biBitCount = 32; + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_OK, "Query cvid->RGB32: %d\n", err); + + err = ICDecompressQuery(h, &bi, NULL); + ok(err == ICERR_OK, "Query cvid 32: %d\n", err); + + bo.biHeight = -bo.biHeight; + err = ICDecompressQuery(h, &bi, &bo); + todo_wine ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); + bo.biHeight = -bo.biHeight; + + ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bo.biBitCount = bi.biBitCount = 8; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB8 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB8 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bo.biBitCount = bi.biBitCount = 16; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "cvid->RGB16 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB16 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bo.biBitCount = bi.biBitCount = 32; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "cvid->RGB32 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB32 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bi.biCompression = mmioFOURCC('C','V','I','D'); + /* Unlike ICOpen, upper case fails with ICLocate. */ + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "CVID->RGB32 upper case succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + } + + bi.biCompression = mmioFOURCC('M','S','V','C'); /* MS Video 1 */ + + bo.biBitCount = bi.biBitCount = 16; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "MSVC->RGB16 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "MSVC->RGB16 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bo.biHeight--; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "MSVC->RGB16 height too small succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight++; + + /* ICLocate wants upper case MSVC */ + bi.biCompression = mmioFOURCC('m','s','v','c'); + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "msvc->RGB16 succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bi.biCompression = mmioFOURCC('M','S','V','C'); + h = ICOpen(ICTYPE_VIDEO, mmioFOURCC('M','S','V','C'), ICMODE_DECOMPRESS); + ok(h != 0, "No MSVC codec installed!?\n"); + if (h != 0) { + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_OK, "Query MSVC->RGB16: %d\n", err); + + err = ICDecompressQuery(h, &bi, NULL); + ok(err == ICERR_OK, "Query MSVC 16: %d\n", err); + + bo.biHeight = -bo.biHeight; + err = ICDecompressQuery(h, &bi, &bo); + todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n", err); + bo.biHeight = -bo.biHeight; + + bi.biCompression = mmioFOURCC('m','s','v','c'); + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); + + ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + } + + bi.biCompression = BI_RGB; + bo.biBitCount = bi.biBitCount = 8; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "RGB8->RGB identity failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bi.biCompression = BI_RLE8; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "RLE8->RGB again failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); +} + START_TEST(msvfw) { test_OpenCase(); + test_Locate(); } Modified: trunk/rostests/winetests/msvfw32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/testlis… ============================================================================== --- trunk/rostests/winetests/msvfw32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/testlist.c [iso-8859-1] Mon Sep 23 11:36:35 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_msvfw(void);

11 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
56
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 September 2013