Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64623: [WINTRUST_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 19:51:36 2014 New Revision: 64623 URL: http://svn.reactos.org/svn/reactos?rev=64623&view=rev Log: [WINTRUST_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/wintrust/crypt.c trunk/rostests/winetests/wintrust/softpub.c Modified: trunk/rostests/winetests/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.… ============================================================================== --- trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] Wed Oct 8 19:51:36 2014 @@ -239,7 +239,7 @@ * FIXME: * We don't want to mess too much with these for now so we should delete only the ones * that shouldn't be there like the deadbeef ones. We first have to figure out if it's - * save to remove files and directories from CatRoot/CatRoot2. + * safe to remove files and directories from CatRoot/CatRoot2. */ ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); @@ -550,7 +550,9 @@ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER || + error == ERROR_BAD_FORMAT, /* win 8 */ + "got %u\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); Modified: trunk/rostests/winetests/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpu… ============================================================================== --- trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] Wed Oct 8 19:51:36 2014 @@ -222,6 +222,7 @@ } else skip("CertCreateCertificateContext failed: %08x\n", GetLastError()); + funcs->pfnFree(data.pasSigners); } }

1 0

[akhaldi] 64622: [WINTRUST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 19:51:13 2014 New Revision: 64622 URL: http://svn.reactos.org/svn/reactos?rev=64622&view=rev Log: [WINTRUST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/wintrust/register.c trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/registe… ============================================================================== --- trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] Wed Oct 8 19:51:13 2014 @@ -896,6 +896,7 @@ NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData; NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg; NewProv.pwszIsFunctionNameFmt2 = NULL; + NewProv.pwszGetCapFuncName = NULL; Ret = CryptSIPAddProvider(&NewProv); Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] Wed Oct 8 19:51:13 2014 @@ -40,20 +40,6 @@ void WINAPI WINTRUST_Free(void *p) { HeapFree(GetProcessHeap(), 0, p); -} - -/*********************************************************************** - * DllMain (WINTRUST.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - 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] Wed Oct 8 19:51:13 2014 @@ -218,7 +218,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to Wine-1.7.17 -reactos/dll/win32/wintrust # Synced to Wine-1.7.17 +reactos/dll/win32/wintrust # Synced to Wine-1.7.27 reactos/dll/win32/wldap32 # Synced to Wine-1.7.17 reactos/dll/win32/wmi # Synced to Wine-1.7.17 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.17

1 0

[jgardou] 64621: [WSHTCPIP] - Implement IPPROTO_TCP:TCP_NODELAY case in WSHSetSocketInformation [TCPIP] - Implement setting TCP_SOCKET_NODELAY connection property.
by jgardou＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: jgardou Date: Wed Oct 8 19:50:38 2014 New Revision: 64621 URL: http://svn.reactos.org/svn/reactos?rev=64621&view=rev Log: [WSHTCPIP] - Implement IPPROTO_TCP:TCP_NODELAY case in WSHSetSocketInformation [TCPIP] - Implement setting TCP_SOCKET_NODELAY connection property. Added: trunk/reactos/drivers/network/tcpip/tcpip/cinfo.c (with props) Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c trunk/reactos/drivers/network/tcpip/CMakeLists.txt trunk/reactos/drivers/network/tcpip/include/info.h trunk/reactos/drivers/network/tcpip/include/tcp.h trunk/reactos/drivers/network/tcpip/tcpip/info.c trunk/reactos/include/psdk/tcpioctl.h trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/lwip/src/include/rosip.h trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -156,12 +156,18 @@ return NO_ERROR; } -UINT -GetAddressOption(INT Level, INT OptionName) +static +void +GetTdiTypeId( + _In_ INT Level, + _In_ INT OptionName, + _Out_ PULONG TdiType, + _Out_ PULONG TdiId) { switch (Level) { case SOL_SOCKET: + *TdiType = INFO_TYPE_ADDRESS_OBJECT; switch (OptionName) { case SO_KEEPALIVE: @@ -174,21 +180,26 @@ break; case IPPROTO_IP: + *TdiType = INFO_TYPE_ADDRESS_OBJECT; switch (OptionName) { case IP_TTL: - return AO_OPTION_TTL; + *TdiId = AO_OPTION_TTL; + return; case IP_DONTFRAGMENT: - return AO_OPTION_IP_DONTFRAGMENT; + *TdiId = AO_OPTION_IP_DONTFRAGMENT; + return; #if 0 case IP_RECEIVE_BROADCAST: - return AO_OPTION_BROADCAST; + *TdiId = AO_OPTION_BROADCAST; + return; #endif case IP_HDRINCL: - return AO_OPTION_IP_HDRINCL; + *TdiId = AO_OPTION_IP_HDRINCL; + return; default: break; @@ -198,10 +209,10 @@ case IPPROTO_TCP: switch (OptionName) { + *TdiType = INFO_TYPE_CONNECTION; case TCP_NODELAY: - /* FIXME: Return proper option */ - ASSERT(FALSE); - break; + *TdiId = TCP_SOCKET_NODELAY; + return; default: break; } @@ -211,7 +222,8 @@ } DPRINT1("Unknown level/option name: %d %d\n", Level, OptionName); - return 0; + *TdiType = 0; + *TdiId = 0; } INT @@ -642,7 +654,7 @@ IN INT OptionLength) { PSOCKET_CONTEXT Context = HelperDllSocketContext; - UINT RealOptionName; + ULONG TdiType, TdiId; INT Status; PTCP_REQUEST_SET_INFORMATION_EX Info; PQUEUED_REQUEST Queued, NextQueued; @@ -697,9 +709,11 @@ switch (OptionName) { case TCP_NODELAY: - /* FIXME -- Send this to TCPIP */ - DPRINT1("Set: TCP_NODELAY not yet supported\n"); - return 0; + if (OptionLength < sizeof(CHAR)) + { + return WSAEFAULT; + } + break; default: /* Invalid option */ @@ -714,8 +728,8 @@ } /* If we get here, GetAddressOption must return something valid */ - RealOptionName = GetAddressOption(Level, OptionName); - ASSERT(RealOptionName != 0); + GetTdiTypeId(Level, OptionName, &TdiId, &TdiType); + ASSERT((TdiId != 0) && (TdiType != 0)); Info = HeapAlloc(GetProcessHeap(), 0, sizeof(*Info) + OptionLength); if (!Info) @@ -724,8 +738,8 @@ Info->ID.toi_entity.tei_entity = Context->AddrFileEntityType; Info->ID.toi_entity.tei_instance = Context->AddrFileInstance; Info->ID.toi_class = INFO_CLASS_PROTOCOL; - Info->ID.toi_type = INFO_TYPE_ADDRESS_OBJECT; - Info->ID.toi_id = RealOptionName; + Info->ID.toi_type = TdiType; + Info->ID.toi_id = TdiId; Info->BufferSize = OptionLength; memcpy(Info->Buffer, OptionValue, OptionLength); Modified: trunk/reactos/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/CMak… ============================================================================== --- trunk/reactos/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -14,6 +14,7 @@ datalink/lan.c tcpip/ainfo.c tcpip/buffer.c + tcpip/cinfo.c tcpip/dispatch.c tcpip/fileobjs.c tcpip/iinfo.c Modified: trunk/reactos/drivers/network/tcpip/include/info.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/info.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/info.h [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -183,6 +183,11 @@ PVOID Buffer, PUINT BufferSize); +TDI_STATUS SetConnectionInfo(TDIObjectID *ID, + PCONNECTION_ENDPOINT Connection, + PVOID Buffer, + UINT BufferSize); + /* Insert and remove entities */ VOID InsertTDIInterfaceEntity( PIP_INTERFACE Interface ); Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -186,6 +186,8 @@ BOOLEAN TCPRemoveIRP( PCONNECTION_ENDPOINT Connection, PIRP Irp ); +NTSTATUS TCPSetNoDelay(PCONNECTION_ENDPOINT Connection, BOOLEAN Set); + VOID TCPUpdateInterfaceLinkStatus(PIP_INTERFACE IF); Added: trunk/reactos/drivers/network/tcpip/tcpip/cinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/cinfo.c (added) +++ trunk/reactos/drivers/network/tcpip/tcpip/cinfo.c [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -0,0 +1,32 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TCP/IP protocol driver + * FILE: tcpip/cinfo.c + * PURPOSE: Per-socket connection information. + * PROGRAMMER: JÃ©rÃ´me Gardou + */ + +#include "precomp.h" + +TDI_STATUS SetConnectionInfo(TDIObjectID *ID, + PCONNECTION_ENDPOINT Connection, + PVOID Buffer, + UINT BufferSize) +{ + ASSERT(ID->toi_type == INFO_TYPE_CONNECTION); + switch (ID->toi_id) + { + case TCP_SOCKET_NODELAY: + { + BOOLEAN Set; + if (BufferSize < sizeof(BOOLEAN)) + return TDI_INVALID_PARAMETER; + Set = *(BOOLEAN*)Buffer; + return TCPSetNoDelay(Connection, Set); + } + default: + DbgPrint("TCPIP: Unknown connection info ID: %u.\n", ID->toi_id); + } + + return TDI_INVALID_PARAMETER; +} Propchange: trunk/reactos/drivers/network/tcpip/tcpip/cinfo.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/drivers/network/tcpip/tcpip/cinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/network/tcpip/tcpip/cinfo.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -326,12 +326,25 @@ switch (ID->toi_class) { case INFO_CLASS_PROTOCOL: - if (ID->toi_type == INFO_TYPE_ADDRESS_OBJECT) + switch (ID->toi_type) { - if ((EntityListContext = GetContext(ID->toi_entity))) - return SetAddressFileInfo(ID, EntityListContext, Buffer, BufferSize); - else - return TDI_INVALID_PARAMETER; + case INFO_TYPE_ADDRESS_OBJECT: + { + if ((EntityListContext = GetContext(ID->toi_entity))) + return SetAddressFileInfo(ID, EntityListContext, Buffer, BufferSize); + else + return TDI_INVALID_PARAMETER; + } + case INFO_TYPE_CONNECTION: + { + PADDRESS_FILE AddressFile = GetContext(ID->toi_entity); + if (AddressFile == NULL) + return TDI_INVALID_PARAMETER; + return SetConnectionInfo(ID, AddressFile->Connection, Buffer, BufferSize); + } + default: + DbgPrint("TCPIP: IOCTL_TCP_SET_INFORMATION_EX - Unrecognized information type for INFO_CLASS_PROTOCOL: 0x%#x.\n", ID->toi_type); + return TDI_INVALID_PARAMETER; } switch (ID->toi_id) Modified: trunk/reactos/include/psdk/tcpioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tcpioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/tcpioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tcpioctl.h [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -90,6 +90,9 @@ #define AO_OPTION_UNBIND 37 #define AO_OPTION_PROTECT 38 +/* TCP connection options */ +#define TCP_SOCKET_NODELAY 1 + typedef struct IFEntry { ULONG if_index; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -674,4 +674,16 @@ return Found; } +NTSTATUS +TCPSetNoDelay( + PCONNECTION_ENDPOINT Connection, + BOOLEAN Set) +{ + if (Connection->SocketContext == NULL) + return STATUS_UNSUCCESSFUL; + LibTCPSetNoDelay(Connection->SocketContext, Set); + return STATUS_SUCCESS; +} + + /* EOF */ Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -107,10 +107,11 @@ err_t LibTCPGetPeerName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port); err_t LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port); void LibTCPAccept(PTCP_PCB pcb, struct tcp_pcb *listen_pcb, void *arg); +void LibTCPSetNoDelay(PTCP_PCB pcb, BOOLEAN Set); /* IP functions */ void LibIPInsertPacket(void *ifarg, const void *const data, const u32_t size); void LibIPInitialize(void); void LibIPShutdown(void); -#endif +#endif Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Wed Oct 8 19:50:38 2014 @@ -829,3 +829,14 @@ return ERR_OK; } + +void +LibTCPSetNoDelay( + PTCP_PCB pcb, + BOOLEAN Set) +{ + if (Set) + pcb->flags |= TF_NODELAY; + else + pcb->flags &= ~TF_NODELAY; +}

1 0

[jgardou] 64620: [PSDK] - Fix mismatch between DEV_BROADCAST_DEVICEINTERFACE_W and DEV_BROADCAST_DEVICEINTERFACE_A - Add DEV_BROADCAST_HANDLE structure definition
by jgardou＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: jgardou Date: Wed Oct 8 19:50:23 2014 New Revision: 64620 URL: http://svn.reactos.org/svn/reactos?rev=64620&view=rev Log: [PSDK] - Fix mismatch between DEV_BROADCAST_DEVICEINTERFACE_W and DEV_BROADCAST_DEVICEINTERFACE_A - Add DEV_BROADCAST_HANDLE structure definition Modified: trunk/reactos/include/psdk/dbt.h Modified: trunk/reactos/include/psdk/dbt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbt.h?rev=646… ============================================================================== --- trunk/reactos/include/psdk/dbt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbt.h [iso-8859-1] Wed Oct 8 19:50:23 2014 @@ -1,5 +1,7 @@ #ifndef _DBT_H #define _DBT_H + +#include "winuser.h" #ifdef __cplusplus extern "C" { @@ -18,6 +20,7 @@ #define DBT_DEVTYP_PORT 3 #define DBT_DEVTYP_NET 4 #define DBT_DEVTYP_DEVICEINTERFACE 5 +#define DBT_DEVTYP_HANDLE 6 #define DBT_APPYBEGIN 0 #define DBT_APPYEND 1 #define DBT_DEVNODES_CHANGED 7 @@ -99,18 +102,37 @@ DWORD dbcv_unitmask; WORD dbcv_flags; } DEV_BROADCAST_VOLUME,*PDEV_BROADCAST_VOLUME; -typedef struct _DEV_BROADCAST_DEVICEINTERFACE { +typedef struct _DEV_BROADCAST_DEVICEINTERFACE_A { DWORD dbcc_size; DWORD dbcc_devicetype; DWORD dbcc_reserved; GUID dbcc_classguid; - TCHAR dbcc_name[1]; -} DEV_BROADCAST_DEVICEINTERFACE, *PDEV_BROADCAST_DEVICEINTERFACE; + CHAR dbcc_name[1]; +} DEV_BROADCAST_DEVICEINTERFACE_A, *PDEV_BROADCAST_DEVICEINTERFACE_A; +typedef struct _DEV_BROADCAST_DEVICEINTERFACE_W { + DWORD dbcc_size; + DWORD dbcc_devicetype; + DWORD dbcc_reserved; + GUID dbcc_classguid; + WCHAR dbcc_name[1]; +} DEV_BROADCAST_DEVICEINTERFACE_W, *PDEV_BROADCAST_DEVICEINTERFACE_W; +typedef struct _DEV_BROADCAST_HANDLE { + DWORD dbch_size; + DWORD dbch_devicetype; + DWORD dbch_reserved; + HANDLE dbch_handle; + HDEVNOTIFY dbch_hdevnotify; + GUID dbch_eventguid; + LONG dbch_nameoffset; + BYTE dbch_data[1]; +} DEV_BROADCAST_HANDLE, *PDEV_BROADCAST_HANDLE; #ifdef UNICODE typedef DEV_BROADCAST_PORT_W DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT; +typedef DEV_BROADCAST_DEVICEINTERFACE_W DEV_BROADCAST_DEVICEINTERFACE, *PDEV_BROADCAST_DEVICEINTERFACE; #else typedef DEV_BROADCAST_PORT_A DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT; +typedef DEV_BROADCAST_DEVICEINTERFACE_A DEV_BROADCAST_DEVICEINTERFACE, *PDEV_BROADCAST_DEVICEINTERFACE; #endif #ifdef __cplusplus

1 0

[jgardou] 64619: [NTOS/SE] - Correctly reference/dereference token object when the set token is already in use.
by jgardou＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: jgardou Date: Wed Oct 8 19:50:14 2014 New Revision: 64619 URL: http://svn.reactos.org/svn/reactos?rev=64619&view=rev Log: [NTOS/SE] - Correctly reference/dereference token object when the set token is already in use. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Oct 8 19:50:14 2014 @@ -243,19 +243,28 @@ if (OldToken == NewToken) { /* So it's a nop. */ - PsDereferencePrimaryToken(OldToken); + *OldTokenP = OldToken; return STATUS_SUCCESS; } Status = SepCompareTokens(OldToken, NewToken, &IsEqual); if (!NT_SUCCESS(Status)) { + *OldTokenP = NULL; PsDereferencePrimaryToken(OldToken); return Status; } - PsDereferencePrimaryToken(OldToken); - return IsEqual ? STATUS_SUCCESS : STATUS_TOKEN_ALREADY_IN_USE; + if (!IsEqual) + { + *OldTokenP = NULL; + PsDereferencePrimaryToken(OldToken); + return STATUS_TOKEN_ALREADY_IN_USE; + } + /* Silently return STATUS_SUCCESS but do not set the new token, + * as it's already in use elsewhere. */ + *OldTokenP = OldToken; + return STATUS_SUCCESS; } /* Mark new token in use */

1 0

[pschweitzer] 64618: [NTFS] - Add missing defines about file attributes - Implement NtfsFCBIsDirectory() Source: http://bos.asmhackers.net/docs/filesystems/ntfs/filename.html
by pschweitzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: pschweitzer Date: Wed Oct 8 19:45:33 2014 New Revision: 64618 URL: http://svn.reactos.org/svn/reactos?rev=64618&view=rev Log: [NTFS] - Add missing defines about file attributes - Implement NtfsFCBIsDirectory() Source: http://bos.asmhackers.net/docs/filesystems/ntfs/filename.html Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Wed Oct 8 19:45:33 2014 @@ -118,10 +118,7 @@ BOOLEAN NtfsFCBIsDirectory(PNTFS_FCB Fcb) { - UNREFERENCED_PARAMETER(Fcb); -// return(Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY); -// return(Fcb->Entry.FileFlags & 0x02); - return TRUE; + return ((Fcb->Entry.FileAttributes & NTFS_FILE_TYPE_DIRECTORY) == NTFS_FILE_TYPE_DIRECTORY); } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Oct 8 19:45:33 2014 @@ -187,6 +187,13 @@ #define NTFS_FILE_NAME_WIN32 1 #define NTFS_FILE_NAME_DOS 2 #define NTFS_FILE_NAME_WIN32_AND_DOS 3 + +#define NTFS_FILE_TYPE_READ_ONLY 0x1 +#define NTFS_FILE_TYPE_HIDDEN 0x2 +#define NTFS_FILE_TYPE_SYSTEM 0x4 +#define NTFS_FILE_TYPE_ARCHIVE 0x20 +#define NTFS_FILE_TYPE_COMPRESSED 0x800 +#define NTFS_FILE_TYPE_DIRECTORY 0x10000000 typedef struct {

1 0

[pschweitzer] 64617: [NTFS] - Add a directory entry into FCB which will be a copy of the $FILE_NAME attribute of the FILE record. Though, it won't contain the name itself (in the FCB instead), so k...
by pschweitzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: pschweitzer Date: Wed Oct 8 19:32:21 2014 New Revision: 64617 URL: http://svn.reactos.org/svn/reactos?rev=64617&view=rev Log: [NTFS] - Add a directory entry into FCB which will be a copy of the $FILE_NAME attribute of the FILE record. Though, it won't contain the name itself (in the FCB instead), so keep first char NULL and length 0. - Implement its support (which requires opening the FILE record 5 first) for root FCB creation. Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Wed Oct 8 19:32:21 2014 @@ -275,19 +275,43 @@ NtfsMakeRootFCB(PNTFS_VCB Vcb) { PNTFS_FCB Fcb; + PFILE_RECORD_HEADER MftRecord; + PFILENAME_ATTRIBUTE FileName; + + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + Vcb->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (MftRecord == NULL) + { + return NULL; + } + + if (!NT_SUCCESS(ReadFileRecord(Vcb, NTFS_FILE_ROOT, MftRecord))) + { + return NULL; + } + + FileName = GetFileNameFromRecord(MftRecord); + if (!FileName) + { + return NULL; + } Fcb = NtfsCreateFCB(L"\\", Vcb); - -// memset(Fcb->entry.Filename, ' ', 11); - -// Fcb->Entry.DataLengthL = Vcb->CdInfo.RootSize; -// Fcb->Entry.ExtentLocationL = Vcb->CdInfo.RootStart; -// Fcb->Entry.FileFlags = 0x02; // FILE_ATTRIBUTE_DIRECTORY; + if (!Fcb) + { + return NULL; + } + + memcpy(&Fcb->Entry, FileName, FIELD_OFFSET(FILENAME_ATTRIBUTE, NameLength)); + Fcb->Entry.NameType = FileName->NameType; + Fcb->Entry.NameLength = 0; + Fcb->Entry.Name[0] = UNICODE_NULL; Fcb->RefCount = 1; Fcb->DirIndex = 0; - Fcb->RFCB.FileSize.QuadPart = PAGE_SIZE;//Vcb->CdInfo.RootSize; - Fcb->RFCB.ValidDataLength.QuadPart = PAGE_SIZE;//Vcb->CdInfo.RootSize; - Fcb->RFCB.AllocationSize.QuadPart = PAGE_SIZE;//Vcb->CdInfo.RootSize; + Fcb->RFCB.FileSize.QuadPart = FileName->DataSize; + Fcb->RFCB.ValidDataLength.QuadPart = FileName->DataSize; + Fcb->RFCB.AllocationSize.QuadPart = FileName->AllocatedSize; Fcb->MFTIndex = NTFS_FILE_ROOT; NtfsFCBInitializeCache(Vcb, Fcb); @@ -390,6 +414,8 @@ return STATUS_INSUFFICIENT_RESOURCES; } + memcpy(&rcFCB->Entry, FileName, FIELD_OFFSET(FILENAME_ATTRIBUTE, NameLength)); + rcFCB->Entry.NameType = FileName->NameType; rcFCB->RFCB.FileSize.QuadPart = FileName->DataSize; rcFCB->RFCB.ValidDataLength.QuadPart = FileName->DataSize; rcFCB->RFCB.AllocationSize.QuadPart = FileName->AllocatedSize; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Oct 8 19:32:21 2014 @@ -107,43 +107,6 @@ NTFS_INFO NtfsInfo; } DEVICE_EXTENSION, *PDEVICE_EXTENSION, NTFS_VCB, *PNTFS_VCB; - - -#define FCB_CACHE_INITIALIZED 0x0001 -#define FCB_IS_VOLUME_STREAM 0x0002 -#define FCB_IS_VOLUME 0x0004 -#define MAX_PATH 260 - -typedef struct _FCB -{ - NTFSIDENTIFIER Identifier; - - FSRTL_COMMON_FCB_HEADER RFCB; - SECTION_OBJECT_POINTERS SectionObjectPointers; - - PFILE_OBJECT FileObject; - PNTFS_VCB Vcb; - - WCHAR *ObjectName; /* point on filename (250 chars max) in PathName */ - WCHAR PathName[MAX_PATH]; /* path+filename 260 max */ - - ERESOURCE PagingIoResource; - ERESOURCE MainResource; - - LIST_ENTRY FcbListEntry; - struct _FCB* ParentFcb; - - ULONG DirIndex; - - LONG RefCount; - ULONG Flags; - - ULONGLONG MFTIndex; - -// DIR_RECORD Entry; - -} NTFS_FCB, *PNTFS_FCB; - typedef struct { @@ -414,6 +377,41 @@ NTFS_ATTR_RECORD Record; } NTFS_ATTR_CONTEXT, *PNTFS_ATTR_CONTEXT; +#define FCB_CACHE_INITIALIZED 0x0001 +#define FCB_IS_VOLUME_STREAM 0x0002 +#define FCB_IS_VOLUME 0x0004 +#define MAX_PATH 260 + +typedef struct _FCB +{ + NTFSIDENTIFIER Identifier; + + FSRTL_COMMON_FCB_HEADER RFCB; + SECTION_OBJECT_POINTERS SectionObjectPointers; + + PFILE_OBJECT FileObject; + PNTFS_VCB Vcb; + + WCHAR *ObjectName; /* point on filename (250 chars max) in PathName */ + WCHAR PathName[MAX_PATH]; /* path+filename 260 max */ + + ERESOURCE PagingIoResource; + ERESOURCE MainResource; + + LIST_ENTRY FcbListEntry; + struct _FCB* ParentFcb; + + ULONG DirIndex; + + LONG RefCount; + ULONG Flags; + + ULONGLONG MFTIndex; + + FILENAME_ATTRIBUTE Entry; + +} NTFS_FCB, *PNTFS_FCB; + extern PNTFS_GLOBAL_DATA NtfsGlobalData; //int CdfsStrcmpi( wchar_t *str1, wchar_t *str2 );

1 0

[akhaldi] 64616: [WINDOWSCODECS_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 19:32:14 2014 New Revision: 64616 URL: http://svn.reactos.org/svn/reactos?rev=64616&view=rev Log: [WINDOWSCODECS_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/windowscodecs/converter.c trunk/rostests/winetests/windowscodecs/metadata.c trunk/rostests/winetests/windowscodecs/propertybag.c trunk/rostests/winetests/windowscodecs/tiffformat.c Modified: trunk/rostests/winetests/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/c… ============================================================================== --- trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] Wed Oct 8 19:32:14 2014 @@ -383,6 +383,7 @@ static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; +static const WCHAR wszInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; static const struct property_opt_test_data testdata_tiff_props[] = { { wszTiffCompressionMethod, VT_UI1, VT_UI1, WICTiffCompressionDontCare }, @@ -513,8 +514,16 @@ } } +struct setting { + const WCHAR *name; + PROPBAG2_TYPE type; + VARTYPE vt; + void *value; +}; + static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, - const struct bitmap_data **dsts, const CLSID *clsid_decoder, const char *name) + const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, + const struct setting *settings, const char *name) { HRESULT hr; IWICBitmapEncoder *encoder; @@ -559,6 +568,26 @@ if(options) test_encoder_properties(clsid_encoder, options); + if (settings) + { + int j; + for (j=0; settings[j].name; j++) + { + PROPBAG2 propbag; + VARIANT var; + + memset(&propbag, 0, sizeof(propbag)); + memset(&var, 0, sizeof(var)); + propbag.pstrName = (LPOLESTR)settings[j].name; + propbag.dwType = settings[j].type; + V_VT(&var) = settings[j].vt; + V_UNKNOWN(&var) = settings[j].value; + + hr = IPropertyBag2_Write(options, 1, &propbag, &var); + ok(SUCCEEDED(hr), "Writing property %s failed, hr=%x\n", wine_dbgstr_w(settings[j].name), hr); + } + } + hr = IWICBitmapFrameEncode_Initialize(frameencode, options); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); @@ -570,8 +599,14 @@ hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); - hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, NULL); - ok(SUCCEEDED(hr), "WriteSource failed, hr=%x\n", hr); + hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); + if (rc && (rc->Width <= 0 || rc->Height <= 0)) + { + /* WriteSource fails but WriteSource_Proxy succeeds. */ + ok(hr == E_INVALIDARG, "WriteSource failed, hr=%x (%s)\n", hr, name); + hr = IWICBitmapFrameEncode_WriteSource_Proxy(frameencode, &src_obj->IWICBitmapSource_iface, rc); + } + ok(SUCCEEDED(hr), "WriteSource failed, hr=%x (%s)\n", hr, name); hr = IWICBitmapFrameEncode_Commit(frameencode); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); @@ -640,7 +675,39 @@ dsts[0] = dst; dsts[1] = NULL; - test_multi_encoder(srcs, clsid_encoder, dsts, clsid_decoder, name); + test_multi_encoder(srcs, clsid_encoder, dsts, clsid_decoder, NULL, NULL, name); +} + +static void test_encoder_rects(void) +{ + const struct bitmap_data *srcs[2]; + const struct bitmap_data *dsts[2]; + WICRect rc; + + srcs[0] = &testdata_24bppBGR; + srcs[1] = NULL; + dsts[0] = &testdata_24bppBGR; + dsts[1] = NULL; + + rc.X = 0; + rc.Y = 0; + rc.Width = 4; + rc.Height = 2; + + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects full"); + + rc.Width = 0; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects width=0"); + + rc.Width = -1; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects width=-1"); + + rc.Width = 4; + rc.Height = 0; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects height=0"); + + rc.Height = -1; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects height=-1"); } static const struct bitmap_data *multiple_frames[3] = { @@ -648,6 +715,15 @@ &testdata_24bppBGR, NULL}; +static const struct bitmap_data *single_frame[2] = { + &testdata_24bppBGR, + NULL}; + +static const struct setting png_interlace_settings[] = { + {wszInterlaceOption, PROPBAG2_TYPE_DATA, VT_BOOL, (void*)VARIANT_TRUE}, + {NULL} +}; + START_TEST(converter) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -678,7 +754,12 @@ &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); test_multi_encoder(multiple_frames, &CLSID_WICTiffEncoder, - multiple_frames, &CLSID_WICTiffDecoder, "TIFF encoder multi-frame"); + multiple_frames, &CLSID_WICTiffDecoder, NULL, NULL, "TIFF encoder multi-frame"); + + test_encoder_rects(); + + test_multi_encoder(single_frame, &CLSID_WICPngEncoder, + single_frame, &CLSID_WICPngDecoder, NULL, png_interlace_settings, "PNG encoder interlaced"); CoUninitialize(); } Modified: trunk/rostests/winetests/windowscodecs/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/m… ============================================================================== --- trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] Wed Oct 8 19:32:14 2014 @@ -850,7 +850,13 @@ stream, &reader); todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); - if (FAILED(hr)) return; + /* NOTE: removed once Wine is fixed */ + if (FAILED(hr)) + { + IStream_Release(stream); + IWICComponentFactory_Release(factory); + return; + } if (SUCCEEDED(hr)) { Modified: trunk/rostests/winetests/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/p… ============================================================================== --- trunk/rostests/winetests/windowscodecs/propertybag.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/propertybag.c [iso-8859-1] Wed Oct 8 19:32:14 2014 @@ -72,10 +72,12 @@ ok(pb[0].vt == VT_UI1, "Invalid variant type, pb[0].vt=%x\n", pb[0].vt); ok(pb[0].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[0].dwType=%x\n", pb[0].dwType); ok(lstrcmpW(pb[0].pstrName, wszTestProperty1) == 0, "Invalid property name, pb[0].pstrName=%s\n", wine_dbgstr_w(pb[0].pstrName)); + CoTaskMemFree(pb[0].pstrName); ok(pb[1].vt == VT_R4, "Invalid variant type, pb[1].vt=%x\n", pb[1].vt); ok(pb[1].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[1].dwType=%x\n", pb[1].dwType); ok(lstrcmpW(pb[1].pstrName, wszTestProperty2) == 0, "Invalid property name, pb[1].pstrName=%s\n", wine_dbgstr_w(pb[1].pstrName)); + CoTaskMemFree(pb[1].pstrName); } static void test_propertybag_countproperties(IPropertyBag2 *property, ULONG expected_count) Modified: trunk/rostests/winetests/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/t… ============================================================================== --- trunk/rostests/winetests/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/tiffformat.c [iso-8859-1] Wed Oct 8 19:32:14 2014 @@ -241,6 +241,9 @@ todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); + if (SUCCEEDED(hr)) + IWICBitmapDecoder_Release(decoder); + pos.QuadPart = 0; hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr);

1 0

[akhaldi] 64615: [WINDOWSCODECS] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 19:30:33 2014 New Revision: 64615 URL: http://svn.reactos.org/svn/reactos?rev=64615&view=rev Log: [WINDOWSCODECS] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/icnsformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/main.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/propertybag.c trunk/reactos/dll/win32/windowscodecs/proxy.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/typeof.h trunk/reactos/dll/win32/windowscodecs/ungif.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -245,63 +245,22 @@ { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; - WICRect rc; - WICPixelFormatGUID guid; TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); - if (!This->initialized || !This->width || !This->height) + if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; - if (!This->format) - { - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - hr = BmpFrameEncode_SetPixelFormat(iface, &guid); - if (FAILED(hr)) return hr; - } - - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) - { - /* should use WICConvertBitmapSource to convert, but that's unimplemented */ - ERR("format %s unsupported\n", debugstr_guid(&guid)); - return E_FAIL; - } - - if (This->xres == 0.0 || This->yres == 0.0) - { - double xres, yres; - hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); - if (FAILED(hr)) return hr; - hr = BmpFrameEncode_SetResolution(iface, xres, yres); - if (FAILED(hr)) return hr; - } - - if (!prc) - { - UINT width, height; - hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); - if (FAILED(hr)) return hr; - rc.X = 0; - rc.Y = 0; - rc.Width = width; - rc.Height = height; - prc = &rc; - } - - if (prc->Width != This->width) return E_INVALIDARG; - - hr = BmpFrameEncode_AllocateBits(This); - if (FAILED(hr)) return hr; - - hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, This->stride, - This->stride*(This->height-This->lineswritten), - This->bits + This->stride*This->lineswritten); - - This->lineswritten += prc->Height; - - return S_OK; + hr = configure_write_source(iface, pIBitmapSource, prc, + This->format ? This->format->guid : NULL, This->width, This->height, + This->xres, This->yres); + + if (SUCCEEDED(hr)) + { + hr = write_source(iface, pIBitmapSource, prc, + This->format->guid, This->format->bpp, This->width, This->height); + } + + return hr; } static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) Modified: trunk/reactos/dll/win32/windowscodecs/icnsformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -374,66 +374,22 @@ { IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; - WICRect rc; - WICPixelFormatGUID guid; - UINT stride; - BYTE *pixeldata = NULL; TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); - if (!This->initialized || !This->size) - { - hr = WINCODEC_ERR_WRONGSTATE; - goto end; - } - - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) - goto end; - if (!IsEqualGUID(&guid, &GUID_WICPixelFormat32bppBGRA)) - { - FIXME("format %s unsupported, could use WICConvertBitmapSource to convert\n", debugstr_guid(&guid)); - hr = E_FAIL; - goto end; - } - - if (!prc) - { - UINT width, height; - hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); - if (FAILED(hr)) - goto end; - rc.X = 0; - rc.Y = 0; - rc.Width = width; - rc.Height = height; - prc = &rc; - } - - if (prc->Width != This->size) - { - hr = E_INVALIDARG; - goto end; - } - - stride = (32 * This->size + 7)/8; - pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); - if (!pixeldata) - { - hr = E_OUTOFMEMORY; - goto end; - } - - hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, - stride*prc->Height, pixeldata); + if (!This->initialized) + return WINCODEC_ERR_WRONGSTATE; + + hr = configure_write_source(iface, pIBitmapSource, &prc, + &GUID_WICPixelFormat32bppBGRA, This->size, This->size, + 1.0, 1.0); + if (SUCCEEDED(hr)) { - hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, - stride*prc->Height, pixeldata); - } - -end: - HeapFree(GetProcessHeap(), 0, pixeldata); + hr = write_source(iface, pIBitmapSource, prc, + &GUID_WICPixelFormat32bppBGRA, 32, This->size, This->size); + } + return hr; } Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -529,20 +529,22 @@ IWICBitmapLock_Release(lock); } - if (SUCCEEDED(hr)) - hr = PaletteImpl_Create(&palette); - if (SUCCEEDED(hr) && (format_type == WICPixelFormatNumericRepresentationUnspecified || format_type == WICPixelFormatNumericRepresentationIndexed)) { - hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + hr = PaletteImpl_Create(&palette); if (SUCCEEDED(hr)) - hr = IWICBitmap_SetPalette(result, palette); - else - hr = S_OK; - - IWICPalette_Release(palette); + { + hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + + if (SUCCEEDED(hr)) + hr = IWICBitmap_SetPalette(result, palette); + else + hr = S_OK; + + IWICPalette_Release(palette); + } } if (SUCCEEDED(hr)) Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -1088,70 +1088,20 @@ { JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; - WICRect rc; - WICPixelFormatGUID guid; - UINT stride; - BYTE *pixeldata; TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); - if (!This->frame_initialized || !This->width || !This->height) + if (!This->frame_initialized) return WINCODEC_ERR_WRONGSTATE; - if (!This->format) - { - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); - if (FAILED(hr)) return hr; - } - - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) - { - /* FIXME: should use WICConvertBitmapSource to convert */ - ERR("format %s unsupported\n", debugstr_guid(&guid)); - return E_FAIL; - } - - if (This->xres == 0.0 || This->yres == 0.0) - { - double xres, yres; - hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); - if (FAILED(hr)) return hr; - hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); - if (FAILED(hr)) return hr; - } - - if (!prc) - { - UINT width, height; - hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); - if (FAILED(hr)) return hr; - rc.X = 0; - rc.Y = 0; - rc.Width = width; - rc.Height = height; - prc = &rc; - } - - if (prc->Width != This->width) return E_INVALIDARG; - - stride = (This->format->bpp * This->width + 7)/8; - - pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); - if (!pixeldata) return E_OUTOFMEMORY; - - hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, - stride*prc->Height, pixeldata); + hr = configure_write_source(iface, pIBitmapSource, prc, + This->format ? This->format->guid : NULL, This->width, This->height, + This->xres, This->yres); if (SUCCEEDED(hr)) { - hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, - stride*prc->Height, pixeldata); - } - - HeapFree(GetProcessHeap(), 0, pixeldata); + hr = write_source(iface, pIBitmapSource, prc, + This->format->guid, This->format->bpp, This->width, This->height); + } return hr; } Modified: trunk/reactos/dll/win32/windowscodecs/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ma… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -103,6 +103,92 @@ } } +HRESULT configure_write_source(IWICBitmapFrameEncode *iface, + IWICBitmapSource *source, const WICRect *prc, + const WICPixelFormatGUID *format, + INT width, INT height, double xres, double yres) +{ + HRESULT hr=S_OK; + WICPixelFormatGUID src_format, dst_format; + + if (width == 0 || height == 0) + return WINCODEC_ERR_WRONGSTATE; + + hr = IWICBitmapSource_GetPixelFormat(source, &src_format); + if (FAILED(hr)) return hr; + + if (!format) + { + dst_format = src_format; + + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &dst_format); + if (FAILED(hr)) return hr; + + format = &dst_format; + } + + if (!IsEqualGUID(&src_format, format)) + { + /* FIXME: should use WICConvertBitmapSource to convert */ + ERR("format %s unsupported\n", debugstr_guid(&src_format)); + return E_FAIL; + } + + if (xres == 0.0 || yres == 0.0) + { + hr = IWICBitmapSource_GetResolution(source, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + return hr; +} + +HRESULT write_source(IWICBitmapFrameEncode *iface, + IWICBitmapSource *source, const WICRect *prc, + const WICPixelFormatGUID *format, UINT bpp, + INT width, INT height) +{ + HRESULT hr=S_OK; + WICRect rc; + UINT stride; + BYTE* pixeldata; + + if (!prc) + { + UINT src_width, src_height; + hr = IWICBitmapSource_GetSize(source, &src_width, &src_height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = src_width; + rc.Height = src_height; + prc = &rc; + } + + if (prc->Width != width || prc->Height <= 0) + return E_INVALIDARG; + + stride = (bpp * width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(source, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + + return hr; +} + void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) { UINT x, y; Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -21,6 +21,8 @@ #ifdef HAVE_PNG_H #include <png.h> #endif + +static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { @@ -164,6 +166,7 @@ #endif MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_interlace_handling); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_set_pHYs); MAKE_FUNCPTR(png_set_read_fn); @@ -213,6 +216,7 @@ #endif LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_interlace_handling); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_pHYs); LOAD_FUNCPTR(png_set_read_fn); @@ -1041,6 +1045,10 @@ BOOL frame_committed; BOOL committed; CRITICAL_SECTION lock; + BOOL interlace; + BYTE *data; + UINT stride; + UINT passes; } PngEncoder; static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1092,8 +1100,32 @@ IPropertyBag2 *pIEncoderOptions) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + BOOL interlace; + PROPBAG2 opts[1]= {{0}}; + VARIANT opt_values[1]; + HRESULT opt_hres[1]; + HRESULT hr; + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + + if (pIEncoderOptions) + { + hr = IPropertyBag2_Read(pIEncoderOptions, 1, opts, NULL, opt_values, opt_hres); + + if (FAILED(hr)) + return hr; + } + else + memset(opt_values, 0, sizeof(opt_values)); + + if (V_VT(&opt_values[0]) == VT_EMPTY) + interlace = FALSE; + else + interlace = (V_BOOL(&opt_values[0]) != 0); + EnterCriticalSection(&This->lock); if (This->frame_initialized) @@ -1101,6 +1133,8 @@ LeaveCriticalSection(&This->lock); return WINCODEC_ERR_WRONGSTATE; } + + This->interlace = interlace; This->frame_initialized = TRUE; @@ -1239,8 +1273,21 @@ if (!This->info_written) { + if (This->interlace) + { + /* libpng requires us to write all data multiple times in this case. */ + This->stride = (This->format->bpp * This->width + 7)/8; + This->data = HeapAlloc(GetProcessHeap(), 0, This->height * This->stride); + if (!This->data) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } + } + ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, - This->format->bit_depth, This->format->color_type, PNG_INTERLACE_NONE, + This->format->bit_depth, This->format->color_type, + This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); if (This->xres != 0.0 && This->yres != 0.0) @@ -1257,7 +1304,24 @@ if (This->format->swap_rgb) ppng_set_bgr(This->png_ptr); + if (This->interlace) + This->passes = ppng_set_interlace_handling(This->png_ptr); + This->info_written = TRUE; + } + + if (This->interlace) + { + /* Just store the data so we can write it in multiple passes in Commit. */ + for (i=0; i<lineCount; i++) + memcpy(This->data + This->stride * (This->lines_written + i), + pbPixels + cbStride * i, + This->stride); + + This->lines_written += lineCount; + + LeaveCriticalSection(&This->lock); + return S_OK; } row_pointers = HeapAlloc(GetProcessHeap(), 0, lineCount * sizeof(png_byte*)); @@ -1285,70 +1349,20 @@ { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; - WICRect rc; - WICPixelFormatGUID guid; - UINT stride; - BYTE *pixeldata; TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); - if (!This->frame_initialized || !This->width || !This->height) + if (!This->frame_initialized) return WINCODEC_ERR_WRONGSTATE; - if (!This->format) - { - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); - if (FAILED(hr)) return hr; - } - - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) - { - /* FIXME: should use WICConvertBitmapSource to convert */ - ERR("format %s unsupported\n", debugstr_guid(&guid)); - return E_FAIL; - } - - if (This->xres == 0.0 || This->yres == 0.0) - { - double xres, yres; - hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); - if (FAILED(hr)) return hr; - hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); - if (FAILED(hr)) return hr; - } - - if (!prc) - { - UINT width, height; - hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); - if (FAILED(hr)) return hr; - rc.X = 0; - rc.Y = 0; - rc.Width = width; - rc.Height = height; - prc = &rc; - } - - if (prc->Width != This->width) return E_INVALIDARG; - - stride = (This->format->bpp * This->width + 7)/8; - - pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); - if (!pixeldata) return E_OUTOFMEMORY; - - hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, - stride*prc->Height, pixeldata); + hr = configure_write_source(iface, pIBitmapSource, prc, + This->format ? This->format->guid : NULL, This->width, This->height, + This->xres, This->yres); if (SUCCEEDED(hr)) { - hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, - stride*prc->Height, pixeldata); - } - - HeapFree(GetProcessHeap(), 0, pixeldata); + hr = write_source(iface, pIBitmapSource, prc, + This->format->guid, This->format->bpp, This->width, This->height); + } return hr; } @@ -1356,6 +1370,7 @@ static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + png_byte **row_pointers=NULL; jmp_buf jmpbuf; TRACE("(%p)\n", iface); @@ -1371,13 +1386,34 @@ if (setjmp(jmpbuf)) { LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, row_pointers); return E_FAIL; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); + if (This->interlace) + { + int i; + + row_pointers = HeapAlloc(GetProcessHeap(), 0, This->height * sizeof(png_byte*)); + if (!row_pointers) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } + + for (i=0; i<This->height; i++) + row_pointers[i] = This->data + This->stride * i; + + for (i=0; i<This->passes; i++) + ppng_write_rows(This->png_ptr, row_pointers, This->height); + } + ppng_write_end(This->png_ptr, This->info_ptr); This->frame_committed = TRUE; + + HeapFree(GetProcessHeap(), 0, row_pointers); LeaveCriticalSection(&This->lock); @@ -1456,6 +1492,7 @@ ppng_destroy_write_struct(&This->png_ptr, &This->info_ptr); if (This->stream) IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); } @@ -1579,6 +1616,8 @@ { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; + PROPBAG2 opts[1]= {{0}}; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); EnterCriticalSection(&This->lock); @@ -1595,7 +1634,11 @@ return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + opts[0].dwType = PROPBAG2_TYPE_DATA; + + hr = CreatePropertyBag2(opts, 1, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); @@ -1690,6 +1733,7 @@ This->lines_written = 0; This->frame_committed = FALSE; This->committed = FALSE; + This->data = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngEncoder.lock"); Modified: trunk/reactos/dll/win32/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -232,7 +232,7 @@ if (iProperty+cProperties > This->prop_count ) return WINCODEC_ERR_VALUEOUTOFRANGE; - *pcProperties = max(cProperties, This->prop_count-iProperty); + *pcProperties = min(cProperties, This->prop_count-iProperty); for (i=0; i < *pcProperties; i++) { Modified: trunk/reactos/dll/win32/windowscodecs/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -208,6 +208,9 @@ HRESULT WINAPI IWICBitmapFrameEncode_WriteSource_Proxy_W(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { + if (prc && (prc->Width <= 0 || prc->Height <= 0)) + prc = NULL; + return IWICBitmapFrameEncode_WriteSource(iface, pIBitmapSource, prc); } Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -1636,73 +1636,23 @@ { TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; - WICRect rc; - WICPixelFormatGUID guid; - UINT stride; - BYTE *pixeldata; TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); - if (!This->initialized || !This->width || !This->height) + if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; - if (!This->format) - { - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); - if (FAILED(hr)) return hr; - } - - hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); - if (FAILED(hr)) return hr; - if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) - { - /* FIXME: should use WICConvertBitmapSource to convert */ - ERR("format %s unsupported\n", debugstr_guid(&guid)); - return E_FAIL; - } - - if (This->xres == 0.0 || This->yres == 0.0) - { - double xres, yres; - hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); - if (FAILED(hr)) return hr; - hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); - if (FAILED(hr)) return hr; - } - - if (!prc) - { - UINT width, height; - hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); - if (FAILED(hr)) return hr; - rc.X = 0; - rc.Y = 0; - rc.Width = width; - rc.Height = height; - prc = &rc; - } - - if (prc->Width != This->width) return E_INVALIDARG; - - stride = (This->format->bpp * This->width + 7)/8; - - pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); - if (!pixeldata) return E_OUTOFMEMORY; - - hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, - stride*prc->Height, pixeldata); + hr = configure_write_source(iface, pIBitmapSource, prc, + This->format ? This->format->guid : NULL, This->width, This->height, + This->xres, This->yres); if (SUCCEEDED(hr)) { - hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, - stride*prc->Height, pixeldata); - } - - HeapFree(GetProcessHeap(), 0, pixeldata); - - return S_OK; + hr = write_source(iface, pIBitmapSource, prc, + This->format->guid, This->format->bpp, This->width, This->height); + } + + return hr; } static HRESULT WINAPI TiffFrameEncode_Commit(IWICBitmapFrameEncode *iface) Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -60,6 +60,7 @@ typedef void (__cdecl typeof(png_set_error_fn))(struct png_struct_def *, void *, png_error_ptr_1, png_error_ptr_1); typedef void (__cdecl typeof(png_set_expand_gray_1_2_4_to_8))(struct png_struct_def *); typedef void (__cdecl typeof(png_set_filler))(struct png_struct_def *, unsigned int, int); +typedef int (__cdecl typeof(png_set_interlace_handling))(struct png_struct_def *); typedef void (__cdecl typeof(png_set_gray_to_rgb))(struct png_struct_def *); typedef void (__cdecl typeof(png_set_IHDR))(struct png_struct_def *, struct png_info_def *, unsigned int, unsigned int, int, int, int, int, int); typedef void (__cdecl typeof(png_set_pHYs))(struct png_struct_def *, struct png_info_def *, unsigned int, unsigned int, int); Modified: trunk/reactos/dll/win32/windowscodecs/ungif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/un… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/ungif.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/ungif.c [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -405,10 +405,7 @@ GifFile->Image.Interlace = (Buf[0] & 0x40); if (Buf[0] & 0x80) { /* Does this image have local color map? */ - /*** FIXME: Why do we check both of these in order to do this? - * Why do we have both Image and SavedImages? */ - if (GifFile->Image.ColorMap && GifFile->SavedImages == NULL) - FreeMapObject(GifFile->Image.ColorMap); + FreeMapObject(GifFile->Image.ColorMap); GifFile->Image.ColorMap = MakeMapObject(1 << BitsPerPixel, NULL); if (GifFile->Image.ColorMap == NULL) { Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Wed Oct 8 19:30:33 2014 @@ -126,6 +126,16 @@ UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) DECLSPEC_HIDDEN; +extern HRESULT configure_write_source(IWICBitmapFrameEncode *iface, + IWICBitmapSource *source, const WICRect *prc, + const WICPixelFormatGUID *format, + INT width, INT height, double xres, double yres) DECLSPEC_HIDDEN; + +extern HRESULT write_source(IWICBitmapFrameEncode *iface, + IWICBitmapSource *source, const WICRect *prc, + const WICPixelFormatGUID *format, UINT bpp, + INT width, INT height) DECLSPEC_HIDDEN; + extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) DECLSPEC_HIDDEN; extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN; 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] Wed Oct 8 19:30:33 2014 @@ -208,7 +208,7 @@ reactos/dll/win32/wbemdisp # Synced to Wine-1.7.17 reactos/dll/win32/wbemprox # Synced to Wine-1.7.27 reactos/dll/win32/wer # Autosync -reactos/dll/win32/windowscodecs # Synced to Wine-1.7.17 +reactos/dll/win32/windowscodecs # Synced to Wine-1.7.27 reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.17 reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.17 reactos/dll/win32/wing32 # Out of sync

1 0

[pschweitzer] 64614: [NTFS] ReadFileRecord() returns a NTSTATUS
by pschweitzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: pschweitzer Date: Wed Oct 8 19:25:00 2014 New Revision: 64614 URL: http://svn.reactos.org/svn/reactos?rev=64614&view=rev Log: [NTFS] ReadFileRecord() returns a NTSTATUS Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Wed Oct 8 19:25:00 2014 @@ -500,7 +500,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if (ReadFileRecord(Vcb, MFTIndex, MftRecord)) + if (NT_SUCCESS(ReadFileRecord(Vcb, MFTIndex, MftRecord))) { //Magic = MftRecord->Magic;

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