Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 74804: [UDFS] Attempt to fix MSVC build CORE-4375
by pschweitzer＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: pschweitzer Date: Sat Jun 3 21:47:53 2017 New Revision: 74804 URL: http://svn.reactos.org/svn/reactos?rev=74804&view=rev Log: [UDFS] Attempt to fix MSVC build CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/env_spec.cpp trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp Modified: trunk/reactos/drivers/filesystems/udfs/env_spec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/e… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/env_spec.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/env_spec.cpp [iso-8859-1] Sat Jun 3 21:47:53 2017 @@ -307,7 +307,7 @@ KeQuerySystemTime((PLARGE_INTEGER)&IoEnterTime); #endif //MEASURE_IO_PERFORMANCE -#if defined DBG || defined USE_PERF_PRINT +#if defined UDF_DBG || defined USE_PERF_PRINT ULONG Lba = (ULONG)(Offset>>0xb); // ASSERT(!(Lba & (32-1))); PerfPrint(("UDFPhWrite: Length: %x Lba: %lx\n",Length>>0xb,Lba)); Modified: trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] Sat Jun 3 21:47:53 2017 @@ -835,7 +835,7 @@ Irp->Tail.Overlay.CurrentStackLocation++; // Now call the appropriate file system driver with the request. - return IoCallDriver( filterDevExt->lowerFSDeviceObject, Irp ); + RC = IoCallDriver( filterDevExt->lowerFSDeviceObject, Irp ); } Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] Sat Jun 3 21:47:53 2017 @@ -2333,12 +2333,14 @@ int8* Buf ) { +#ifdef UDF_DBG ImpUseVolDesc* iuvd = (ImpUseVolDesc*)Buf; ImpUseVolDescImpUse* iuvdiu = (ImpUseVolDescImpUse*)&(iuvd->impUse); UDFPrint(("UDF: Imp Use Vol Desc:\n")); UDFPrint((" volDescSeqNum = %x\n", iuvd->volDescSeqNum)); UDFPrint(("UDF: Imp Use Vol Desc Imp Use:\n")); KdDump(iuvdiu, sizeof(ImpUseVolDescImpUse)); +#endif return STATUS_SUCCESS; } // UDFLoadImpUseVolDesc()

1 0

[hbelusca] 74803: [NTDLL][USER32]: Stub out two APIs that are called by Win32 dlls: - ntdll.dll: RtlConvertUiListToApiList(), which is a helper used by netapi32.dll; - user32.dll: GetWinStationInfo...
by hbelusca＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: hbelusca Date: Sat Jun 3 20:26:26 2017 New Revision: 74803 URL: http://svn.reactos.org/svn/reactos?rev=74803&view=rev Log: [NTDLL][USER32]: Stub out two APIs that are called by Win32 dlls: - ntdll.dll: RtlConvertUiListToApiList(), which is a helper used by netapi32.dll; - user32.dll: GetWinStationInfo() (that just calls into win32k), which is called by e.g. winmm.dll . Added: trunk/reactos/dll/ntdll/rtl/uilist.c (with props) Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/win32ss/user/user32/misc/winsta.c trunk/reactos/win32ss/user/user32/user32.spec Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sat Jun 3 20:26:26 2017 @@ -20,6 +20,7 @@ ldr/ldrpe.c ldr/ldrutils.c rtl/libsupp.c + rtl/uilist.c rtl/version.c etw/trace.c include/ntdll.h) Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Jun 3 20:26:26 2017 @@ -502,7 +502,7 @@ 501 stdcall RtlConvertSharedToExclusive(ptr) 502 stdcall RtlConvertSidToUnicodeString(ptr ptr long) 503 stdcall RtlConvertToAutoInheritSecurityObject(ptr ptr ptr ptr long ptr) -# stdcall RtlConvertUiListToApiList +504 stdcall RtlConvertUiListToApiList(ptr ptr long) 505 stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) 506 stdcall RtlCopyLuid(ptr ptr) 507 stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) Added: trunk/reactos/dll/ntdll/rtl/uilist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/uilist.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/uilist.c (added) +++ trunk/reactos/dll/ntdll/rtl/uilist.c [iso-8859-1] Sat Jun 3 20:26:26 2017 @@ -0,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NT User-Mode DLL + * FILE: lib/ntdll/rtl/uilist.c + * PURPOSE: RTL UI to API network computers list conversion. + * Helper for NETAPI32.DLL + * PROGRAMMERS: Hermes Belusca-Maito + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ***************************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlConvertUiListToApiList( + IN PUNICODE_STRING UiList, + OUT PUNICODE_STRING ApiList, + IN BOOLEAN SpaceAsSeparator) +{ + DPRINT1("RtlConvertUiListToApiList(%wZ, 0x%p, %s) called\n", + UiList, &ApiList, SpaceAsSeparator ? "true" : "false"); + UNIMPLEMENTED; + /* + * Experiments show that returning a success code but setting the + * ApiList length to zero is better than returning a failure code. + */ + RtlInitEmptyUnicodeString(ApiList, NULL, 0); + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/dll/ntdll/rtl/uilist.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/user/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/w… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] Sat Jun 3 20:26:26 2017 @@ -286,6 +286,16 @@ /* + * @unimplemented on Win32k side + */ +BOOL WINAPI +GetWinStationInfo(PVOID pUnknown) +{ + return (BOOL)NtUserCallOneParam((DWORD_PTR)pUnknown, ONEPARAM_ROUTINE_GETWINSTAINFO); +} + + +/* * @implemented */ HWINSTA WINAPI Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… ============================================================================== --- trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] Sat Jun 3 20:26:26 2017 @@ -366,7 +366,7 @@ 363 stdcall GetUserObjectInformationA(long long ptr long ptr) 364 stdcall GetUserObjectInformationW(long long ptr long ptr) NtUserGetObjectInformation 365 stdcall GetUserObjectSecurity (long ptr ptr long ptr) -# GetWinStationInfo +366 stdcall GetWinStationInfo(ptr) 367 stdcall GetWindow(long long) 368 stdcall GetWindowContextHelpId(long) 369 stdcall GetWindowDC(long) NtUserGetWindowDC

1 0

[pschweitzer] 74802: [UDFS] Make the driver really less verbose by introducing two macros UDFPrint and UDFPrintErr So far, because of sed -i, almost all KdPrint became UDFPrint. It would be interes...
by pschweitzer＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: pschweitzer Date: Sat Jun 3 20:09:21 2017 New Revision: 74802 URL: http://svn.reactos.org/svn/reactos?rev=74802&view=rev Log: [UDFS] Make the driver really less verbose by introducing two macros UDFPrint and UDFPrintErr So far, because of sed -i, almost all KdPrint became UDFPrint. It would be interesting to promote some to UDFPrintErr (if someone motivated ;-)) CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp trunk/reactos/drivers/filesystems/udfs/Include/env_spec_w32.cpp trunk/reactos/drivers/filesystems/udfs/Include/getopt.cpp trunk/reactos/drivers/filesystems/udfs/Include/mem_tools.cpp trunk/reactos/drivers/filesystems/udfs/Include/misc_common.cpp trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.cpp trunk/reactos/drivers/filesystems/udfs/Include/regtools.cpp trunk/reactos/drivers/filesystems/udfs/Include/wcache_lib.cpp trunk/reactos/drivers/filesystems/udfs/cleanup.cpp trunk/reactos/drivers/filesystems/udfs/close.cpp trunk/reactos/drivers/filesystems/udfs/create.cpp trunk/reactos/drivers/filesystems/udfs/devcntrl.cpp trunk/reactos/drivers/filesystems/udfs/dircntrl.cpp trunk/reactos/drivers/filesystems/udfs/dldetect.cpp trunk/reactos/drivers/filesystems/udfs/env_spec.cpp trunk/reactos/drivers/filesystems/udfs/fastio.cpp trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp trunk/reactos/drivers/filesystems/udfs/filter.cpp trunk/reactos/drivers/filesystems/udfs/flush.cpp trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp trunk/reactos/drivers/filesystems/udfs/lockctrl.cpp trunk/reactos/drivers/filesystems/udfs/misc.cpp trunk/reactos/drivers/filesystems/udfs/pnp.cpp trunk/reactos/drivers/filesystems/udfs/read.cpp trunk/reactos/drivers/filesystems/udfs/secursup.cpp trunk/reactos/drivers/filesystems/udfs/shutdown.cpp trunk/reactos/drivers/filesystems/udfs/udf_dbg.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/alloc.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp trunk/reactos/drivers/filesystems/udfs/udffs.h trunk/reactos/drivers/filesystems/udfs/udfinit.cpp trunk/reactos/drivers/filesystems/udfs/unload.cpp trunk/reactos/drivers/filesystems/udfs/verfysup.cpp trunk/reactos/drivers/filesystems/udfs/volinfo.cpp trunk/reactos/drivers/filesystems/udfs/write.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/Include/env_spec_w32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/Include/getopt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/Include/mem_tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/Include/misc_common.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/Include/regtools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/Include/wcache_lib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… Modified: trunk/reactos/drivers/filesystems/udfs/cleanup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/c… Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/c… Modified: trunk/reactos/drivers/filesystems/udfs/create.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/c… Modified: trunk/reactos/drivers/filesystems/udfs/devcntrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/d… Modified: trunk/reactos/drivers/filesystems/udfs/dircntrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/d… Modified: trunk/reactos/drivers/filesystems/udfs/dldetect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/d… Modified: trunk/reactos/drivers/filesystems/udfs/env_spec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/e… Modified: trunk/reactos/drivers/filesystems/udfs/fastio.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… Modified: trunk/reactos/drivers/filesystems/udfs/filter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… Modified: trunk/reactos/drivers/filesystems/udfs/flush.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… Modified: trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… Modified: trunk/reactos/drivers/filesystems/udfs/lockctrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/l… Modified: trunk/reactos/drivers/filesystems/udfs/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/m… Modified: trunk/reactos/drivers/filesystems/udfs/pnp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/p… Modified: trunk/reactos/drivers/filesystems/udfs/read.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/r… Modified: trunk/reactos/drivers/filesystems/udfs/secursup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/s… Modified: trunk/reactos/drivers/filesystems/udfs/shutdown.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/s… Modified: trunk/reactos/drivers/filesystems/udfs/udf_dbg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/alloc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/udfinit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/unload.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… Modified: trunk/reactos/drivers/filesystems/udfs/verfysup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/v… Modified: trunk/reactos/drivers/filesystems/udfs/volinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/v… Modified: trunk/reactos/drivers/filesystems/udfs/write.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/w…

1 0

[pschweitzer] 74801: [UDFS] Fix broken code when UDF_DBG isn't set CORE-4375
by pschweitzer＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: pschweitzer Date: Sat Jun 3 19:56:50 2017 New Revision: 74801 URL: http://svn.reactos.org/svn/reactos?rev=74801&view=rev Log: [UDFS] Fix broken code when UDF_DBG isn't set CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] Sat Jun 3 19:56:50 2017 @@ -1860,7 +1860,9 @@ UDFPackMapping(Vcb, ExtInfo); } AdPrint(("Alloc->Rec (1) new %x\n", ExtInfo->Mapping)); +#ifdef UDF_DBG ASSERT(check_size == UDFGetExtentLength(ExtInfo->Mapping)); +#endif AdPrint(("Alloc->Rec: ExtInfo %x, Extent %x\n", ExtInfo, ExtInfo->Mapping)); return STATUS_SUCCESS; } @@ -1928,8 +1930,10 @@ ExtInfo->Mapping = NewExtent; if(TryPack) UDFPackMapping(Vcb, ExtInfo); +#ifdef UDF_DBG ASSERT(check_size == UDFGetExtentLength(ExtInfo->Mapping)); ASSERT(!(check_size & (LBS-1))); +#endif AdPrint(("Alloc->Rec: ExtInfo %x, Extent %x\n", ExtInfo, ExtInfo->Mapping)); @@ -2828,8 +2832,10 @@ NewMap[j].extLength = NewMap[j].extLocation = 0; +#ifdef UDF_DBG ASSERT(check_size == UDFGetExtentLength(ExtInfo->Mapping)); ASSERT(check_size == UDFGetExtentLength(NewMap)); +#endif AdPrint(("Pack ExtInfo %x, NewMap %x, OldMap %x\n", ExtInfo, NewMap, OldMap)); Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp [iso-8859-1] Sat Jun 3 19:56:50 2017 @@ -2419,7 +2419,9 @@ if(!KeepDloc) { +#ifdef UDF_DBG ASSERT(!Modified); +#endif #ifndef UDF_TRACK_ONDISK_ALLOCATION if(Dloc->DataLoc.Mapping) MyFreePool__(Dloc->DataLoc.Mapping);

1 0

[akhaldi] 74800: [HTTPAPI] Sync with Wine Staging 2.9. CORE-13362 ef975ef httpapi: Add stub for HttpCreateServerSession.
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 19:02:20 2017 New Revision: 74800 URL: http://svn.reactos.org/svn/reactos?rev=74800&view=rev Log: [HTTPAPI] Sync with Wine Staging 2.9. CORE-13362 ef975ef httpapi: Add stub for HttpCreateServerSession. Modified: trunk/reactos/dll/win32/httpapi/httpapi.spec trunk/reactos/dll/win32/httpapi/httpapi_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/httpapi/httpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi.… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/httpapi/httpapi.spec [iso-8859-1] Sat Jun 3 19:02:20 2017 @@ -6,6 +6,7 @@ @ stub HttpCreateConfigGroup @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) +@ stdcall HttpCreateServerSession(long ptr long) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept Modified: trunk/reactos/dll/win32/httpapi/httpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi_… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/httpapi/httpapi_main.c [iso-8859-1] Sat Jun 3 19:02:20 2017 @@ -187,3 +187,12 @@ FIXME( "(%p, %s, %p): stub!\n", handle, debugstr_w(url), reserved ); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * HttpCreateServerSession (HTTPAPI.@) + */ +ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved ) +{ + FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved ); + return ERROR_ACCESS_DENIED; +} 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] Sat Jun 3 19:02:20 2017 @@ -72,7 +72,7 @@ reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9 reactos/dll/win32/hlink # Synced to WineStaging-2.9 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 -reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to WineStaging-2.2 reactos/dll/win32/ieframe # Synced to WineStaging-2.2 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2

1 0

[akhaldi] 74799: [PSDK] Update http.h. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 19:02:15 2017 New Revision: 74799 URL: http://svn.reactos.org/svn/reactos?rev=74799&view=rev Log: [PSDK] Update http.h. CORE-13362 Modified: trunk/reactos/sdk/include/psdk/http.h Modified: trunk/reactos/sdk/include/psdk/http.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/http.h?re… ============================================================================== --- trunk/reactos/sdk/include/psdk/http.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/http.h [iso-8859-1] Sat Jun 3 19:02:15 2017 @@ -50,9 +50,15 @@ HttpServiceConfigMax } HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID; +typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID; +typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID; + ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID); +ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); +ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); +ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);

1 0

[akhaldi] 74798: [HLINK] Sync with Wine Staging 2.9. CORE-13362 d5c3a31 hlink: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 19:02:10 2017 New Revision: 74798 URL: http://svn.reactos.org/svn/reactos?rev=74798&view=rev Log: [HLINK] Sync with Wine Staging 2.9. CORE-13362 d5c3a31 hlink: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Modified: trunk/reactos/dll/win32/hlink/hlink_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hlink/hlink_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_priv… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] Sat Jun 3 19:02:10 2017 @@ -41,14 +41,14 @@ extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } static inline BOOL heap_free(void *mem) 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] Sat Jun 3 19:02:10 2017 @@ -70,7 +70,7 @@ reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 reactos/dll/win32/gdiplus # Synced to WineStaging-2.9 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9 -reactos/dll/win32/hlink # Synced to WineStaging-2.2 +reactos/dll/win32/hlink # Synced to WineStaging-2.9 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-2.2

1 0

[akhaldi] 74797: [HHCTRL.OCX] Sync with Wine Staging 2.9. CORE-13362 e5a12b7 hhcrtl.ocx: Fix some spec file entries.
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 19:02:05 2017 New Revision: 74797 URL: http://svn.reactos.org/svn/reactos?rev=74797&view=rev Log: [HHCTRL.OCX] Sync with Wine Staging 2.9. CORE-13362 e5a12b7 hhcrtl.ocx: Fix some spec file entries. Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.spec [iso-8859-1] Sat Jun 3 19:02:05 2017 @@ -1,6 +1,6 @@ 13 stdcall doWinMain(long ptr) -14 stdcall HtmlHelpA(ptr ptr long long) -15 stdcall HtmlHelpW(ptr ptr long long) +14 stdcall HtmlHelpA(ptr str long long) +15 stdcall HtmlHelpW(ptr wstr long long) @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() 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] Sat Jun 3 19:02:05 2017 @@ -69,7 +69,7 @@ reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 reactos/dll/win32/gdiplus # Synced to WineStaging-2.9 -reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.2 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9 reactos/dll/win32/hlink # Synced to WineStaging-2.2 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74796: [GDIPLUS_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 19:01:59 2017 New Revision: 74796 URL: http://svn.reactos.org/svn/reactos?rev=74796&view=rev Log: [GDIPLUS_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/region.c trunk/rostests/winetests/gdiplus/stringformat.c Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat Jun 3 19:01:59 2017 @@ -553,6 +553,12 @@ stat = GdipGetFontStyle(font, &style); expect(Ok, stat); + stat = GdipGetFontHeight(NULL, NULL, &fm->font_height); + expect(InvalidParameter, stat); + + stat = GdipGetFontHeight(font, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipGetFontHeight(font, NULL, &fm->font_height); expect(Ok, stat); stat = GdipGetFontSize(font, &fm->font_size); Modified: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… ============================================================================== --- trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] Sat Jun 3 19:01:59 2017 @@ -152,6 +152,8 @@ /* some Windows versions fail to properly clear the aligned DWORD */ ok_(__FILE__, line)(data[size - 1] == buf[size - 1] || broken(data[size - 1] != buf[size - 1]), "off %u: %#x != %#x\n", size - 1, data[size - 1], buf[size - 1]); + + GdipDeleteRegion(region); } static void test_getregiondata(void) Modified: trunk/rostests/winetests/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/stringf… ============================================================================== --- trunk/rostests/winetests/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/stringformat.c [iso-8859-1] Sat Jun 3 19:01:59 2017 @@ -36,7 +36,7 @@ GpStringFormat *format; GpStatus stat; INT n, count; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -45,7 +45,7 @@ expect(Ok, stat); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -53,7 +53,7 @@ expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); @@ -146,11 +146,11 @@ static void test_getgenerictypographic(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -163,9 +163,15 @@ stat = GdipStringFormatGetGenericTypographic(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericTypographic(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -175,11 +181,29 @@ flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingNone, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + + /* Change format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericTypographic(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); stat = GdipDeleteStringFormat(format); expect(Ok, stat); @@ -292,12 +316,12 @@ static void test_getgenericdefault(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -310,9 +334,15 @@ stat = GdipStringFormatGetGenericDefault(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericDefault(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -321,11 +351,29 @@ expect(0, flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + + /* Change default format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericDefault(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); stat = GdipDeleteStringFormat(format); expect(Ok, stat);

1 0

[akhaldi] 74795: [GDIPLUS] Sync with Wine Staging 2.9. CORE-13362 11fc5c0 gdiplus: Prefer using pre-multiplied ARGB data in the scaler. 17162a9 gdiplus: Remove ceilf/floorf calls from bilinear scal...
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 19:01:50 2017 New Revision: 74795 URL: http://svn.reactos.org/svn/reactos?rev=74795&view=rev Log: [GDIPLUS] Sync with Wine Staging 2.9. CORE-13362 11fc5c0 gdiplus: Prefer using pre-multiplied ARGB data in the scaler. 17162a9 gdiplus: Remove ceilf/floorf calls from bilinear scaler. (v2) 6bade0c gdiplus: Change multiplications by additions in the x/y scaler loops. db49130 gdiplus: Change the order of x/y loops in the scaler. 9247b54 gdiplus: Set correct color space flags for grayscale images. 81ccd6b gdiplus: Force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA. 4fe61f3 gdiplus: Ignore an externally set DC clipping region. a188922 gdiplus: Ignore an externally set DC origin. b8a8e1b gdiplus: Check SHADEBLENDCAPS only for printer devices. c2a4f19 gdiplus: Fix compilation on systems that don't support nameless unions. 29a55bc gdiplus: Use software mode to draw semi-transparent lines when necessary. c89de1d gdiplus: Use better naming for line alignment format field. 69b41e7 gdiplus: Fix generic string formats behavior. a3f0a59 gdiplus: Avoid infinite recursion in flatten_bezier(). 36c9ac3 gdiplus: Check for null in GdipGetFontHeight. 7f25431 gdiplus: Fix GdipCreateStreamOnFile spec file entry. 43e36d6 gdiplus: Simplify and standardize the heap_xxx() declarations. Modified: trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/stringformat.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -542,6 +542,8 @@ REAL font_height; TRACE("%p %p %p\n", font, graphics, height); + + if (!font || !height) return InvalidParameter; stat = GdipGetFontHeightGivenDPI(font, font->family->dpi, &font_height); if (stat != Ok) return stat; Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -46,11 +46,13 @@ { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); + init_generic_string_formats(); break; case DLL_PROCESS_DETACH: if (reserved) break; free_installed_fonts(); + free_generic_string_formats(); break; } return TRUE; Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -120,7 +120,7 @@ 120 stdcall GdipCreateRegionRectI(ptr ptr) 121 stdcall GdipCreateRegionRgnData(ptr long ptr) 122 stdcall GdipCreateSolidFill(long ptr) -123 stdcall GdipCreateStreamOnFile(ptr long ptr) +123 stdcall GdipCreateStreamOnFile(wstr long ptr) 124 stdcall GdipCreateStringFormat(long long ptr) 125 stdcall GdipCreateTexture2(ptr long float float float float ptr) 126 stdcall GdipCreateTexture2I(ptr long long long long long ptr) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -56,22 +56,19 @@ #define GIF_DISPOSE_RESTORE_TO_BKGND 2 #define GIF_DISPOSE_RESTORE_TO_PREV 3 -static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static void *heap_alloc_zero(size_t len) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static void *heap_realloc(void *mem, size_t len) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem) @@ -452,6 +449,8 @@ Unit unit; }; +extern const struct GpStringFormat default_drawstring_format DECLSPEC_HIDDEN; + struct GpStringFormat{ INT attr; LANGID lang; @@ -459,7 +458,7 @@ StringAlignment align; StringTrimming trimming; HotkeyPrefix hkprefix; - StringAlignment vertalign; + StringAlignment line_align; StringDigitSubstitute digitsub; INT tabcount; REAL firsttab; @@ -468,6 +467,9 @@ INT range_count; BOOL generic_typographic; }; + +extern void init_generic_string_formats(void) DECLSPEC_HIDDEN; +extern void free_generic_string_formats(void) DECLSPEC_HIDDEN; struct GpFontCollection{ GpFontFamily **FontFamilies; Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -519,12 +519,23 @@ return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL, fmt); } +/* NOTE: start and end pixels must be in pre-multiplied ARGB format */ +static inline ARGB blend_colors_premult(ARGB start, ARGB end, REAL position) +{ + UINT pos = position * 255.0f + 0.5f; + return + (((((start >> 24) ) << 8) + (((end >> 24) ) - ((start >> 24) )) * pos) >> 8) << 24 | + (((((start >> 16) & 0xff) << 8) + (((end >> 16) & 0xff) - ((start >> 16) & 0xff)) * pos) >> 8) << 16 | + (((((start >> 8) & 0xff) << 8) + (((end >> 8) & 0xff) - ((start >> 8) & 0xff)) * pos) >> 8) << 8 | + (((((start ) & 0xff) << 8) + (((end ) & 0xff) - ((start ) & 0xff)) * pos) >> 8); +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { INT start_a, end_a, final_a; INT pos; - pos = gdip_round(position * 0xff); + pos = (INT)(position * 255.0f + 0.5f); start_a = ((start >> 24) & 0xff) * (pos ^ 0xff); end_a = ((end >> 24) & 0xff) * pos; @@ -926,6 +937,11 @@ return ((DWORD*)(bits))[(x - src_rect->X) + (y - src_rect->Y) * src_rect->Width]; } +static inline int positive_ceilf(float f) +{ + return f - (int)f > 0.0f ? f + 1.0f : f; +} + static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, UINT height, GpPointF *point, GDIPCONST GpImageAttributes *attributes, InterpolationMode interpolation, PixelOffsetMode offset_mode) @@ -946,12 +962,12 @@ ARGB top, bottom; float x_offset; - leftxf = floorf(point->X); - leftx = (INT)leftxf; - rightx = (INT)ceilf(point->X); - topyf = floorf(point->Y); - topy = (INT)topyf; - bottomy = (INT)ceilf(point->Y); + leftx = (INT)point->X; + leftxf = (REAL)leftx; + rightx = positive_ceilf(point->X); + topy = (INT)point->Y; + topyf = (REAL)topy; + bottomy = positive_ceilf(point->Y); if (leftx == rightx && topy == bottomy) return sample_bitmap_pixel(src_rect, bits, width, height, @@ -995,17 +1011,95 @@ } } +static ARGB resample_bitmap_pixel_premult(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, + UINT height, GpPointF *point, GDIPCONST GpImageAttributes *attributes, + InterpolationMode interpolation, PixelOffsetMode offset_mode) +{ + static int fixme; + + switch (interpolation) + { + default: + if (!fixme++) + FIXME("Unimplemented interpolation %i\n", interpolation); + /* fall-through */ + case InterpolationModeBilinear: + { + REAL leftxf, topyf; + INT leftx, rightx, topy, bottomy; + ARGB topleft, topright, bottomleft, bottomright; + ARGB top, bottom; + float x_offset; + + leftx = (INT)point->X; + leftxf = (REAL)leftx; + rightx = positive_ceilf(point->X); + topy = (INT)point->Y; + topyf = (REAL)topy; + bottomy = positive_ceilf(point->Y); + + if (leftx == rightx && topy == bottomy) + return sample_bitmap_pixel(src_rect, bits, width, height, + leftx, topy, attributes); + + topleft = sample_bitmap_pixel(src_rect, bits, width, height, + leftx, topy, attributes); + topright = sample_bitmap_pixel(src_rect, bits, width, height, + rightx, topy, attributes); + bottomleft = sample_bitmap_pixel(src_rect, bits, width, height, + leftx, bottomy, attributes); + bottomright = sample_bitmap_pixel(src_rect, bits, width, height, + rightx, bottomy, attributes); + + x_offset = point->X - leftxf; + top = blend_colors_premult(topleft, topright, x_offset); + bottom = blend_colors_premult(bottomleft, bottomright, x_offset); + + return blend_colors_premult(top, bottom, point->Y - topyf); + } + case InterpolationModeNearestNeighbor: + { + FLOAT pixel_offset; + switch (offset_mode) + { + default: + case PixelOffsetModeNone: + case PixelOffsetModeHighSpeed: + pixel_offset = 0.5; + break; + + case PixelOffsetModeHalf: + case PixelOffsetModeHighQuality: + pixel_offset = 0.0; + break; + } + return sample_bitmap_pixel(src_rect, bits, width, height, + floorf(point->X + pixel_offset), point->Y + pixel_offset, attributes); + } + + } +} + static REAL intersect_line_scanline(const GpPointF *p1, const GpPointF *p2, REAL y) { return (p1->X - p2->X) * (p2->Y - y) / (p2->Y - p1->Y) + p2->X; } -static BOOL brush_can_fill_path(GpBrush *brush) +/* is_fill is TRUE if filling regions, FALSE for drawing primitives */ +static BOOL brush_can_fill_path(GpBrush *brush, BOOL is_fill) { switch (brush->bt) { case BrushTypeSolidColor: - return TRUE; + { + if (is_fill) + return TRUE; + else + { + /* cannot draw semi-transparent colors */ + return (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000; + } + } case BrushTypeHatchFill: { GpHatch *hatch = (GpHatch*)brush; @@ -3003,8 +3097,10 @@ lockeddata.Scan0 = src_data; if (!do_resampling && bitmap->format == PixelFormat32bppPARGB) lockeddata.PixelFormat = apply_image_attributes(imageAttributes, NULL, 0, 0, 0, ColorAdjustTypeBitmap, bitmap->format); + else if (imageAttributes != &defaultImageAttributes) + lockeddata.PixelFormat = PixelFormat32bppARGB; else - lockeddata.PixelFormat = PixelFormat32bppARGB; + lockeddata.PixelFormat = PixelFormat32bppPARGB; stat = GdipBitmapLockBits(bitmap, &src_area, ImageLockModeRead|ImageLockModeUserInputBuf, lockeddata.PixelFormat, &lockeddata); @@ -3024,6 +3120,8 @@ if (do_resampling) { + REAL delta_xx, delta_xy, delta_yx, delta_yy; + /* Transform the bits as needed to the destination. */ dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); if (!dst_data) @@ -3041,24 +3139,42 @@ y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; - for (x=dst_area.left; x<dst_area.right; x++) + delta_yy = dst_area.top * y_dy; + delta_yx = dst_area.top * y_dx; + + for (y=dst_area.top; y<dst_area.bottom; y++) { - for (y=dst_area.top; y<dst_area.bottom; y++) + delta_xx = dst_area.left * x_dx; + delta_xy = dst_area.left * x_dy; + + for (x=dst_area.left; x<dst_area.right; x++) { GpPointF src_pointf; ARGB *dst_color; - src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; - src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; + src_pointf.X = dst_to_src_points[0].X + delta_xx + delta_yx; + src_pointf.Y = dst_to_src_points[0].Y + delta_xy + delta_yy; dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) - *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, - imageAttributes, interpolation, offset_mode); + { + if (lockeddata.PixelFormat != PixelFormat32bppPARGB) + *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, + imageAttributes, interpolation, offset_mode); + else + *dst_color = resample_bitmap_pixel_premult(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, + imageAttributes, interpolation, offset_mode); + } else *dst_color = 0; + + delta_xx += x_dx; + delta_yx += y_dx; } + + delta_xy += x_dy; + delta_yy += y_dy; } } else @@ -3784,7 +3900,7 @@ if (path->pathdata.Count == 0) return Ok; - if (!graphics->hdc) + if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) retval = SOFTWARE_GdipDrawPath(graphics, pen, path); else retval = GDI32_GdipDrawPath(graphics, pen, path); @@ -4034,7 +4150,7 @@ GpStatus retval; HRGN hrgn=NULL; - if(!graphics->hdc || !brush_can_fill_path(brush)) + if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) return NotImplemented; save_state = SaveDC(graphics->hdc); @@ -4327,7 +4443,7 @@ HRGN hrgn; RECT rc; - if(!graphics->hdc || !brush_can_fill_path(brush)) + if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) return NotImplemented; status = GdipGetRegionHRgn(region, graphics, &hrgn); @@ -4908,7 +5024,6 @@ INT hotkeyprefix_count=0; INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; BOOL seen_prefix = FALSE; - GpStringFormat *dyn_format=NULL; if(length == -1) length = lstrlenW(string); @@ -4916,15 +5031,7 @@ if(!stringdup) return OutOfMemory; if (!format) - { - stat = GdipStringFormatGetGenericDefault(&dyn_format); - if (stat != Ok) - { - heap_free(stringdup); - return stat; - } - format = dyn_format; - } + format = &default_drawstring_format; nwidth = rect->Width; nheight = rect->Height; @@ -5074,7 +5181,6 @@ heap_free(stringdup); heap_free(hotkeyprefix_offsets); - GdipDeleteStringFormat(dyn_format); return stat; } @@ -5426,19 +5532,19 @@ /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ - if(format->vertalign != StringAlignmentNear){ + if(format->line_align != StringAlignmentNear){ RectF bounds, in_rect = *rect; in_rect.Height = 0.0; /* avoid height clipping */ GdipMeasureString(graphics, string, length, font, &in_rect, format, &bounds, 0, 0); TRACE("bounds %s\n", debugstr_rectf(&bounds)); - if(format->vertalign == StringAlignmentCenter) + if(format->line_align == StringAlignmentCenter) offsety = (rect->Height - bounds.Height) / 2; - else if(format->vertalign == StringAlignmentFar) + else if(format->line_align == StringAlignmentFar) offsety = (rect->Height - bounds.Height); } - TRACE("vertical align %d, offsety %f\n", format->vertalign, offsety); + TRACE("line align %d, offsety %f\n", format->line_align, offsety); } save_state = SaveDC(hdc); Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -127,6 +127,10 @@ mp[2].X = (mp[1].X + mp[3].X) / 2.0; mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; + + if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || + (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) + return TRUE; pt = end->pt; pt_st = start->pt; @@ -1010,13 +1014,13 @@ heap_free(backup); return status; } - if (format && format->vertalign == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) + if (format && format->line_align == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; inc /= 2; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; - } else if (format && format->vertalign == StringAlignmentFar) { + } else if (format && format->line_align == StringAlignmentFar) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -40,7 +40,6 @@ { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, - { &GUID_WICPixelFormat32bppGrayFloat, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, @@ -49,6 +48,7 @@ { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppCMYK, PixelFormat32bppCMYK, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppGrayFloat, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat64bppCMYK, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat64bppRGBA, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { NULL } Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfo… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] Sat Jun 3 19:01:50 2017 @@ -19,6 +19,47 @@ #include "gdiplus_private.h" +const GpStringFormat default_drawstring_format = +{ + 0, + LANG_NEUTRAL, + LANG_NEUTRAL, + StringAlignmentNear, + StringTrimmingCharacter, + HotkeyPrefixNone, + StringAlignmentNear, + StringDigitSubstituteUser, + 0, + 0.0, + NULL, + NULL, + 0, + FALSE +}; + +static GpStringFormat generic_default_format; +static GpStringFormat generic_typographic_format; + +void init_generic_string_formats(void) +{ + memcpy(&generic_default_format, &default_drawstring_format, sizeof(generic_default_format)); + + memcpy(&generic_typographic_format, &default_drawstring_format, sizeof(generic_typographic_format)); + generic_typographic_format.attr = StringFormatFlagsNoFitBlackBox | StringFormatFlagsLineLimit | + StringFormatFlagsNoClip; + generic_typographic_format.trimming = StringTrimmingNone; + generic_typographic_format.generic_typographic = TRUE; +} + +void free_generic_string_formats(void) +{ + heap_free(generic_default_format.character_ranges); + heap_free(generic_default_format.tabs); + + heap_free(generic_typographic_format.character_ranges); + heap_free(generic_typographic_format.tabs); +} + GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format) { @@ -53,6 +94,9 @@ if(!format) return InvalidParameter; + if (format == &generic_default_format || format == &generic_typographic_format) + return Ok; + heap_free(format->character_ranges); heap_free(format->tabs); heap_free(format); @@ -62,17 +106,10 @@ GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **format) { - GpStatus stat; - if (!format) return InvalidParameter; - stat = GdipCreateStringFormat(0, LANG_NEUTRAL, format); - if(stat != Ok) - return stat; - - (*format)->align = StringAlignmentNear; - (*format)->vertalign = StringAlignmentNear; + *format = &generic_default_format; return Ok; } @@ -128,7 +165,7 @@ if(!format || !align) return InvalidParameter; - *align = format->vertalign; + *align = format->line_align; return Ok; } @@ -232,7 +269,7 @@ if(!format) return InvalidParameter; - format->vertalign = align; + format->line_align = align; return Ok; } @@ -357,24 +394,10 @@ GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **format) { - GpStatus stat; - - if(!format) - return InvalidParameter; - - stat = GdipCreateStringFormat(StringFormatFlagsNoFitBlackBox | - StringFormatFlagsLineLimit | - StringFormatFlagsNoClip, LANG_NEUTRAL, format); - if(stat != Ok) - return stat; - - (*format)->digitlang = LANG_NEUTRAL; - (*format)->digitsub = StringDigitSubstituteUser; - (*format)->trimming = StringTrimmingNone; - (*format)->hkprefix = HotkeyPrefixNone; - (*format)->align = StringAlignmentNear; - (*format)->vertalign = StringAlignmentNear; - (*format)->generic_typographic = TRUE; + if(!format) + return InvalidParameter; + + *format = &generic_typographic_format; TRACE("%p => %p\n", format, *format); 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] Sat Jun 3 19:01:50 2017 @@ -68,7 +68,7 @@ reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 -reactos/dll/win32/gdiplus # Synced to WineStaging-2.2 +reactos/dll/win32/gdiplus # Synced to WineStaging-2.9 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.2 reactos/dll/win32/hlink # Synced to WineStaging-2.2 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs