Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 71591: [CONSRV] - Remove a wrong assertion that I introduced in r70281 concerning Console->LinePos. - Fix some boundary conditions. - Completely reset line discipline variables when the ...
by hbelusca＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: hbelusca Date: Tue Jun 7 22:52:44 2016 New Revision: 71591 URL: http://svn.reactos.org/svn/reactos?rev=71591&view=rev Log: [CONSRV] - Remove a wrong assertion that I introduced in r70281 concerning Console->LinePos. - Fix some boundary conditions. - Completely reset line discipline variables when the line buffer is freed. - Fix a potential buffer overrun in the case ReadControl->nInitialChars was larger than Console->LineMaxSize (the size of Console->LineBuffer), which serves to initialize Console->LineSize, Console->LinePos, and copy nInitialChars characters from user buffer. CORE-11380 CORE-10997 #resolve Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Tue Jun 7 22:52:44 2016 @@ -330,7 +330,13 @@ { /* Start a new line */ Console->LineMaxSize = max(256, NumCharsToRead); - ASSERT(ReadControl->nInitialChars <= Console->LineMaxSize); + + /* + * Fixup ReadControl->nInitialChars in case the number of initial + * characters is bigger than the number of characters to be read. + * It will always be, lesser than or equal to Console->LineMaxSize. + */ + ReadControl->nInitialChars = min(ReadControl->nInitialChars, NumCharsToRead); Console->LineBuffer = ConsoleAllocHeap(0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) return STATUS_NO_MEMORY; @@ -346,7 +352,7 @@ * worry about ANSI <-> Unicode conversion. */ memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); - if (Console->LineSize == Console->LineMaxSize) + if (Console->LineSize >= Console->LineMaxSize) { Console->LineComplete = TRUE; Console->LinePos = 0; @@ -356,7 +362,7 @@ /* If we don't have a complete line yet, process the pending input */ while (!Console->LineComplete && !IsListEmpty(&InputBuffer->InputEvents)) { - /* Remove input event from queue */ + /* Remove an input event from the queue */ CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); if (IsListEmpty(&InputBuffer->InputEvents)) { @@ -378,12 +384,14 @@ /* Check if we have a complete line to read from */ if (Console->LineComplete) { - // NOTE: I want to check whether we always set LinePos to zero - // when LineComplete is set to TRUE. - // Basically, we are going to use LinePos as 'i'. - ASSERT(Console->LinePos == 0); - - while (i < NumCharsToRead && Console->LinePos != Console->LineSize) + /* + * Console->LinePos keeps the next position of the character to read + * in the line buffer across the different calls of the function, + * so that the line buffer can be read by chunks after all the input + * has been buffered. + */ + + while (i < NumCharsToRead && Console->LinePos < Console->LineSize) { WCHAR Char = Console->LineBuffer[Console->LinePos++]; @@ -398,11 +406,14 @@ ++i; } - if (Console->LinePos == Console->LineSize) - { - /* Entire line has been read */ + if (Console->LinePos >= Console->LineSize) + { + /* The entire line has been read */ ConsoleFreeHeap(Console->LineBuffer); Console->LineBuffer = NULL; + Console->LinePos = Console->LineMaxSize = Console->LineSize = 0; + // Console->LineComplete = Console->LineUpPressed = FALSE; + Console->LineComplete = FALSE; } Status = STATUS_SUCCESS; @@ -415,7 +426,7 @@ /* Character input */ while (i < NumCharsToRead && !IsListEmpty(&InputBuffer->InputEvents)) { - /* Remove input event from queue */ + /* Remove an input event from the queue */ CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); if (IsListEmpty(&InputBuffer->InputEvents)) {

1 0

[ekohl] 71590: [SC] Add the sdshow command.
by ekohl＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: ekohl Date: Tue Jun 7 21:51:37 2016 New Revision: 71590 URL: http://svn.reactos.org/svn/reactos?rev=71590&view=rev Log: [SC] Add the sdshow command. Added: trunk/reactos/base/applications/sc/sdshow.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -8,6 +8,7 @@ print.c query.c sc.c + sdshow.c start.c usage.c sc.h) Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -179,6 +179,18 @@ else ControlUsage(); } + else if (!lstrcmpi(Command, _T("sdshow"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + SdShow(ServiceName); + } + else + SdShowUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -6,6 +6,7 @@ #include <windef.h> #include <winbase.h> #include <winsvc.h> +#include <sddl.h> #include <tchar.h> #define SCDBG @@ -18,6 +19,7 @@ BOOL Query(LPCTSTR *ServiceArgs, DWORD ArgCount, BOOL bExtended); LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName); +BOOL SdShow(LPCTSTR ServiceName); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -35,5 +37,6 @@ VOID DeleteUsage(VOID); VOID CreateUsage(VOID); VOID ControlUsage(VOID); +VOID SdShowUsage(VOID); #endif /* _SC_PCH_ */ Added: trunk/reactos/base/applications/sc/sdshow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sdsho… ============================================================================== --- trunk/reactos/base/applications/sc/sdshow.c (added) +++ trunk/reactos/base/applications/sc/sdshow.c [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -0,0 +1,101 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/sdshow.c + * PURPOSE: Show a service security descriptor + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL SdShow(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + LPTSTR pStringBuffer = NULL; + +#ifdef SCDBG + _tprintf(_T("service to show sd - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, READ_CONTROL); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceObjectSecurity(hService, + DACL_SECURITY_INFORMATION, + (PSECURITY_DESCRIPTOR)&pSecurityDescriptor, + sizeof(PSECURITY_DESCRIPTOR), + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pSecurityDescriptor = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pSecurityDescriptor == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceObjectSecurity(hService, + DACL_SECURITY_INFORMATION, + pSecurityDescriptor, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + if (!ConvertSecurityDescriptorToStringSecurityDescriptor(pSecurityDescriptor, + SDDL_REVISION_1, + DACL_SECURITY_INFORMATION, + &pStringBuffer, + NULL)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("\n%s\n"), pStringBuffer); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pStringBuffer != NULL) + LocalFree(pStringBuffer); + + if (pSecurityDescriptor != NULL) + HeapFree(GetProcessHeap(), 0, pSecurityDescriptor); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/sdshow.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -41,8 +41,8 @@ // "\t qfailure : Queries the actions taken by a service upon failure.\n" _T("\t delete : Deletes a service (from the registry).\n") _T("\t create : Creates a service. (adds it to the registry).\n") - _T("\t control : Sends a control to a service.\n")); -// "\t sdshow : Displays a service's security descriptor.\n") + _T("\t control : Sends a control to a service.\n") + _T("\t sdshow : Displays a service's security descriptor.\n")); // "\t sdset : Sets a service's security descriptor.\n") // "\t GetDisplayName : Gets the DisplayName for a service.\n") // "\t GetKeyName : Gets the ServiceKeyName for a service.\n") @@ -190,3 +190,11 @@ _T("USAGE:\n") _T(" sc <server> control [service name] <value>\n")); } + +VOID SdShowUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Displays a service's security descriptor in SDDL format.\n") + _T("USAGE:\n") + _T(" sc <server> sdshow <service name>\n")); +}

1 0

[apriyadarshi] 71589: Added AhciHwInterrupt -- Round Robin Implementation (SharedPort) Added Support Function AhciInterruptHandler Added DeviceInquiryRequest - Need to implement EVPD. SRB_FUNCTION_...
by apriyadarshi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: apriyadarshi Date: Tue Jun 7 18:06:51 2016 New Revision: 71589 URL: http://svn.reactos.org/svn/reactos?rev=71589&view=rev Log: Added AhciHwInterrupt -- Round Robin Implementation (SharedPort) Added Support Function AhciInterruptHandler Added DeviceInquiryRequest - Need to implement EVPD. SRB_FUNCTION_EXECUTE_SCSI for cdb->CDB10.OperationCode != SCSIOP_INQUIRY Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Tue Jun 7 18:06:51 2016 @@ -6,22 +6,6 @@ */ #include "storahci.h" - -BOOLEAN AhciAdapterReset( - __in PAHCI_ADAPTER_EXTENSION adapterExtension -); - -__inline -VOID AhciZeroMemory( - __in PCHAR buffer, - __in ULONG bufferSize -); - -__inline -BOOLEAN IsPortValid( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in UCHAR pathId -); /** * @name AhciPortInitialize @@ -192,6 +176,24 @@ }// -- AhciHwInitialize(); /** + * @name AhciInterruptHandler + * @implemented + * + * Interrupt Handler for portExtension + * + * @param portExtension + * + */ +VOID AhciInterruptHandler( + __in PAHCI_PORT_EXTENSION portExtension +) +{ + StorPortDebugPrint(0, "AhciInterruptHandler()\n"); + StorPortDebugPrint(0, "\tPort Number: %d\n", portExtension->PortNumber); + +}// -- AhciInterruptHandler(); + +/** * @name AhciHwInterrupt * @implemented * @@ -207,11 +209,39 @@ __in PVOID AdapterExtension ) { + ULONG portPending, nextPort, i; PAHCI_ADAPTER_EXTENSION adapterExtension; StorPortDebugPrint(0, "AhciHwInterrupt()\n"); adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + + if (adapterExtension->StateFlags.Removed) + return FALSE; + + portPending = StorPortReadRegisterUlong(adapterExtension, adapterExtension->IS); + // we process interrupt for implemented ports only + portPending = portPending & adapterExtension->PortImplemented; + + if (portPending == 0) + return FALSE; + + for (i = 1; i <= MAXIMUM_AHCI_PORT_COUNT; i++) + { + nextPort = (adapterExtension->LastInterruptPort + i) % MAXIMUM_AHCI_PORT_COUNT; + + if ((portPending & (0x1 << nextPort)) == 0) + continue; + + if (nextPort == adapterExtension->LastInterruptPort + || adapterExtension->PortExtension[nextPort].IsActive == FALSE) + return FALSE; + + // we can assign this interrupt to this port + adapterExtension->LastInterruptPort = nextPort; + AhciInterruptHandler(nextPort); + return TRUE; + } return FALSE; }// -- AhciHwInterrupt(); @@ -302,7 +332,10 @@ PCDB cdb = (PCDB)&Srb->Cdb; if (cdb->CDB10.OperationCode == SCSIOP_INQUIRY) { - StorPortDebugPrint(0, "\tINQUIRY Called!\n"); + Srb->SrbStatus = DeviceInquiryRequest(adapterExtension, Srb, cdb); + StorPortNotification(RequestComplete, adapterExtension, Srb); + + return TRUE; } } else @@ -343,7 +376,7 @@ adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; - return TRUE; + return FALSE; }// -- AhciHwResetBus(); /** @@ -455,15 +488,16 @@ adapterExtension->CAP = StorPortReadRegisterUlong(adapterExtension, &abar->CAP); adapterExtension->CAP2 = StorPortReadRegisterUlong(adapterExtension, &abar->CAP2); adapterExtension->Version = StorPortReadRegisterUlong(adapterExtension, &abar->VS); + adapterExtension->LastInterruptPort = -1; // 10.1.2 // 1. Indicate that system software is AHCI aware by setting GHC.AE to â1â. // 3.1.2 -- AE bit is read-write only if CAP.SAM is '0' ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); // AE := Highest Significant bit of GHC - if ((ghc & AHCI_Global_HBA_CONTROL_AE) == 1)//Hmm, controller was already in power state - { - // reset controller to have it in know state + if ((ghc & AHCI_Global_HBA_CONTROL_AE) != 0)//Hmm, controller was already in power state + { + // reset controller to have it in known state StorPortDebugPrint(0, "\tAE Already set, Reset()\n"); if (!AhciAdapterReset(adapterExtension)){ StorPortDebugPrint(0, "\tReset Failed!\n"); @@ -603,7 +637,7 @@ return FALSE; // HR -- Very first bit (lowest significant) - ghc = 1; + ghc = AHCI_Global_HBA_CONTROL_HR; StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); for (ticks = 0; (ticks < 50) && @@ -647,7 +681,7 @@ * @param PathId * * @return - * return TRUE if bus was successfully reset + * return TRUE if provided port is valid (implemented) or not */ __inline BOOLEAN IsPortValid( @@ -657,5 +691,55 @@ { if (pathId >= MAXIMUM_AHCI_PORT_COUNT) return FALSE; + return adapterExtension->PortExtension[pathId].IsActive; }// -- IsPortValid() + +/** + * @name DeviceInquiryRequest + * @implemented + * + * Tells wheather given port is implemented or not + * + * @param adapterExtension + * @param Srb + * @param Cdb + * + * @return + * return STOR status for DeviceInquiryRequest + * + * @remark + * http://www.seagate.com/staticfiles/support/disc/manuals/Interface%20manuals… + */ +ULONG DeviceInquiryRequest( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb +) +{ + PVOID DataBuffer; + ULONG DataBufferLength; + + StorPortDebugPrint(0, "DeviceInquiryRequest()\n"); + + // 3.6.1 + // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data + if (Cdb->CDB6INQUIRY3.EnableVitalProductData == 0) + { + StorPortDebugPrint(0, "\tEVPD Inquired\n"); + } + else + { + StorPortDebugPrint(0, "\tVPD Inquired\n"); + + DataBuffer = Srb->DataBuffer; + DataBufferLength = Srb->DataTransferLength; + + if (DataBuffer == NULL) + return SRB_STATUS_INVALID_REQUEST; + + AhciZeroMemory((PCHAR)DataBuffer, DataBufferLength); + } + + return SRB_STATUS_BAD_FUNCTION; +}// -- DeviceInquiryRequest(); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Tue Jun 7 18:06:51 2016 @@ -212,6 +212,7 @@ ULONG Version; ULONG CAP; ULONG CAP2; + ULONG LastInterruptPort; PVOID NonCachedExtension;// holds virtual address to noncached buffer allocated for Port Extension @@ -231,3 +232,29 @@ { ULONG Reserved[4]; } AHCI_SRB_EXTENSION; + +////////////////////////////////////////////////////////////// +// Declarations // +////////////////////////////////////////////////////////////// + +BOOLEAN AhciAdapterReset( + __in PAHCI_ADAPTER_EXTENSION adapterExtension +); + +__inline +VOID AhciZeroMemory( + __in PCHAR buffer, + __in ULONG bufferSize +); + +__inline +BOOLEAN IsPortValid( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId +); + +ULONG DeviceInquiryRequest( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb +);

1 0

[apriyadarshi] 71588: AHCI-SATA Interface almost ready. - tested on VM. - need to implement Interrupt Routine (MessagePerPort) and ATA/ATAPI Based SCSI Query.
by apriyadarshi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: apriyadarshi Date: Tue Jun 7 11:05:32 2016 New Revision: 71588 URL: http://svn.reactos.org/svn/reactos?rev=71588&view=rev Log: AHCI-SATA Interface almost ready. - tested on VM. - need to implement Interrupt Routine (MessagePerPort) and ATA/ATAPI Based SCSI Query. Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] Tue Jun 7 11:05:32 2016 @@ -1,6 +1,7 @@ TARGETNAME = storahci TARGETTYPE = MINIPORT +MSC_WARNING_LEVEL=/W4 TARGETLIBS=$(DDK_LIB_PATH)\storport.lib INCLUDES = %BUILD%\inc Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Tue Jun 7 11:05:32 2016 @@ -11,11 +11,18 @@ __in PAHCI_ADAPTER_EXTENSION adapterExtension ); +__inline VOID AhciZeroMemory( __in PCHAR buffer, __in ULONG bufferSize ); +__inline +BOOLEAN IsPortValid( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId +); + /** * @name AhciPortInitialize * @implemented @@ -40,6 +47,7 @@ adapterExtension = portExtension->AdapterExtension; abar = adapterExtension->ABAR_Address; + portExtension->Port = &abar->PortList[portExtension->PortNumber]; commandListPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->CommandList, &mappedLength); @@ -61,6 +69,14 @@ StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->CLB, commandListPhysical.LowPart); StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->FB, receivedFISPhysical.LowPart); + // set device power state flag to D0 + portExtension->DevicePowerState = StorPowerDeviceD0; + + // clear pending interrupts + StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->SERR, (ULONG)-1); + StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->IS, (ULONG)-1); + StorPortWriteRegisterUlong(adapterExtension, portExtension->AdapterExtension->IS, (1 << portExtension->PortNumber)); + return TRUE; }// -- AhciPortInitialize(); @@ -87,7 +103,7 @@ StorPortDebugPrint(0, "AhciAllocateResourceForAdapter()\n"); - // 3.1.1 NCS = CAP[12:08] -> Align + // 3.1.1 NCS = CAP[12:08] -> Align NCS = (adapterExtension->CAP & 0xF00) >> 8; AlignedNCS = ((NCS/8) + 1) * 8; @@ -116,33 +132,16 @@ nonCachedExtension = (PCHAR)adapterExtension->NonCachedExtension; AhciZeroMemory(nonCachedExtension, nonCachedExtensionSize); - - - // allocate memory for port extension - /* --> Allocate memory for port extension, but right now it is returning STOR_STATUS_NOT_IMPLEMENTED - so, for testing purpose, I allocated during driver entry itself. - status = StorPortAllocatePool( - adapterExtension, - portCount * sizeof(AHCI_PORT_EXTENSION), - AHCI_POOL_TAG, - (PVOID*)&portsExtension); - - if (status != STOR_STATUS_SUCCESS){ - StorPortDebugPrint(0, "\tstatus : %x\n", status); - return FALSE; - } - - AhciZeroMemory((PCHAR)portsExtension, portCount * sizeof(AHCI_PORT_EXTENSION)); - */ + nonCachedExtensionSize /= portCount; currentCount = 0; - for (index = 0; index < 32; index++) - { + for (index = 0; index < MAXIMUM_AHCI_PORT_COUNT; index++) + { + adapterExtension->PortExtension[index].IsActive = FALSE; if ((adapterExtension->PortImplemented & (1<<index)) != 0) { - //adapterExtension->PortExtension[index] = (PAHCI_PORT_EXTENSION)((PCHAR)portsExtension + sizeof(AHCI_PORT_EXTENSION) * currentCount); - adapterExtension->PortExtension[index].PortNumber = index; + adapterExtension->PortExtension[index].IsActive = TRUE; adapterExtension->PortExtension[index].AdapterExtension = adapterExtension; adapterExtension->PortExtension[index].CommandList = (PAHCI_COMMAND_HEADER)(nonCachedExtension + (currentCount*nonCachedExtensionSize)); adapterExtension->PortExtension[index].ReceivedFIS = (PAHCI_RECEIVED_FIS)((PCHAR)adapterExtension->PortExtension[index].CommandList + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); @@ -168,11 +167,26 @@ __in PVOID AdapterExtension ) { + ULONG ghc, messageCount, status; PAHCI_ADAPTER_EXTENSION adapterExtension; StorPortDebugPrint(0, "AhciHwInitialize()\n"); adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + adapterExtension->StateFlags.MessagePerPort = FALSE; + + // First check what type of interrupt/synchronization device is using + ghc = StorPortReadRegisterUlong(adapterExtension, &adapterExtension->ABAR_Address->GHC); + + //When set to â1â by hardware, indicates that the HBA requested more than one MSI vector + //but has reverted to using the first vector only. When this bit is cleared to â0â, + //the HBA has not reverted to single MSI mode (i.e. hardware is already in single MSI mode, + //software has allocated the number of messages requested + if ((ghc & AHCI_Global_HBA_CONTROL_MRSM) == 0) + { + adapterExtension->StateFlags.MessagePerPort = TRUE; + StorPortDebugPrint(0, "\tMultiple MSI based message not supported\n"); + } return TRUE; }// -- AhciHwInitialize(); @@ -199,7 +213,7 @@ adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; - return TRUE; + return FALSE; }// -- AhciHwInterrupt(); /** @@ -221,14 +235,87 @@ ) { - UCHAR function; + UCHAR function, pathId; PAHCI_ADAPTER_EXTENSION adapterExtension; StorPortDebugPrint(0, "AhciHwStartIo()\n"); + pathId = Srb->PathId; + function = Srb->Function; adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; - function = Srb->Function; - + + if (!IsPortValid(adapterExtension, pathId)) + { + Srb->SrbStatus = SRB_STATUS_NO_DEVICE; + StorPortNotification(RequestComplete, adapterExtension, Srb); + return TRUE; + } + + // https://msdn.microsoft.com/windows/hardware/drivers/storage/handling-srb-fu… + // If the function member of an SRB is set to SRB_FUNCTION_PNP, + // the SRB is a structure of type SCSI_PNP_REQUEST_BLOCK. + if (function == SRB_FUNCTION_PNP) + { + PSCSI_PNP_REQUEST_BLOCK pnpRequest; + + pnpRequest = (PSCSI_PNP_REQUEST_BLOCK)Srb; + if ((pnpRequest->SrbPnPFlags & SRB_PNP_FLAGS_ADAPTER_REQUEST) != 0) + { + if (pnpRequest->PnPAction == StorRemoveDevice || + pnpRequest->PnPAction == StorSurpriseRemoval) + { + Srb->SrbStatus = SRB_STATUS_SUCCESS; + adapterExtension->StateFlags.Removed = 1; + StorPortDebugPrint(0, "\tadapter removed\n"); + } + else if (pnpRequest->PnPAction == StorStopDevice) + { + Srb->SrbStatus = SRB_STATUS_SUCCESS; + StorPortDebugPrint(0, "\tRequested to Stop the adapter\n"); + } + else + Srb->SrbStatus = SRB_STATUS_INVALID_REQUEST; + StorPortNotification(RequestComplete, adapterExtension, Srb); + return TRUE; + } + } + + if (function == SRB_FUNCTION_EXECUTE_SCSI) + { + // https://msdn.microsoft.com/en-us/windows/hardware/drivers/storage/handling-… + // On receipt of an SRB_FUNCTION_EXECUTE_SCSI request, a miniport driver's HwScsiStartIo + // routine does the following: + // + // - Gets and/or sets up whatever context the miniport driver maintains in its device, + // logical unit, and/or SRB extensions + // For example, a miniport driver might set up a logical unit extension with pointers + // to the SRB itself and the SRB DataBuffer pointer, the SRB DataTransferLength value, + // and a driver-defined value (or CDB SCSIOP_XXX value) indicating the operation to be + // carried out on the HBA. + // + // - Calls an internal routine to program the HBA, as partially directed by the SrbFlags, + // for the requested operation + // For a device I/O operation, such an internal routine generally selects the target device + // and sends the CDB over the bus to the target logical unit. + if (Srb->CdbLength > 0) + { + PCDB cdb = (PCDB)&Srb->Cdb; + if (cdb->CDB10.OperationCode == SCSIOP_INQUIRY) + { + StorPortDebugPrint(0, "\tINQUIRY Called!\n"); + } + } + else + { + Srb->SrbStatus = SRB_STATUS_BAD_FUNCTION; + StorPortNotification(RequestComplete, adapterExtension, Srb); + return TRUE; + } + } + + StorPortDebugPrint(0, "\tUnknow function code recieved: %x\n", function); + Srb->SrbStatus = SRB_STATUS_BAD_FUNCTION; + StorPortNotification(RequestComplete, adapterExtension, Srb); return TRUE; }// -- AhciHwStartIo(); @@ -305,7 +392,7 @@ ULONG portCount, portImplemented; ULONG pci_cfg_len; UCHAR pci_cfg_buf[0x30]; - + PAHCI_MEMORY_REGISTERS abar; PPCI_COMMON_CONFIG pciConfigData; PAHCI_ADAPTER_EXTENSION adapterExtension; @@ -315,7 +402,7 @@ adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; adapterExtension->SlotNumber = ConfigInfo->SlotNumber; adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; - + // get PCI configuration header pci_cfg_len = StorPortGetBusData( adapterExtension, @@ -374,7 +461,7 @@ // 3.1.2 -- AE bit is read-write only if CAP.SAM is '0' ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); // AE := Highest Significant bit of GHC - if ((ghc & (0x1<<31)) == 1)//Hmm, controller was already in power state + if ((ghc & AHCI_Global_HBA_CONTROL_AE) == 1)//Hmm, controller was already in power state { // reset controller to have it in know state StorPortDebugPrint(0, "\tAE Already set, Reset()\n"); @@ -384,10 +471,10 @@ } } - ghc = 0x1<<31;// only AE=1 + ghc = AHCI_Global_HBA_CONTROL_AE;// only AE=1 StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - adapterExtension->IS = abar->IS; + adapterExtension->IS = &abar->IS; adapterExtension->PortImplemented = StorPortReadRegisterUlong(adapterExtension, &abar->PI); if (adapterExtension->PortImplemented == 0){ @@ -400,23 +487,23 @@ ConfigInfo->MaximumNumberOfTargets = 1; ConfigInfo->MaximumNumberOfLogicalUnits = 1; ConfigInfo->ResetTargetSupported = TRUE; - ConfigInfo->NumberOfBuses = 32; + ConfigInfo->NumberOfBuses = MAXIMUM_AHCI_PORT_COUNT; ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex; ConfigInfo->ScatterGather = TRUE; // Turn IE -- Interrupt Enabled - ghc |= 0x2; + ghc |= AHCI_Global_HBA_CONTROL_IE; StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - + // allocate necessary resource for each port if (!AhciAllocateResourceForAdapter(adapterExtension, ConfigInfo)){ StorPortDebugPrint(0, "\tAhciAllocateResourceForAdapter() == FALSE\n"); return SP_RETURN_ERROR; } - for (index = 0; index < 32; index++) - { - if ((adapterExtension->PortImplemented & (1<<index)) != 0) + for (index = 0; index < MAXIMUM_AHCI_PORT_COUNT; index++) + { + if ((adapterExtension->PortImplemented & (0x1<<index)) != 0) AhciPortInitialize(&adapterExtension->PortExtension[index]); } @@ -443,7 +530,7 @@ HW_INITIALIZATION_DATA hwInitializationData; ULONG i, status; - StorPortDebugPrint(0, "Storahci Loaded 10023\n"); + StorPortDebugPrint(0, "Storahci Loaded\n"); // initialize the hardware data structure AhciZeroMemory((PCHAR)&hwInitializationData, sizeof(HW_INITIALIZATION_DATA)); @@ -471,13 +558,14 @@ // set required extension sizes hwInitializationData.SrbExtensionSize = sizeof(AHCI_SRB_EXTENSION); hwInitializationData.DeviceExtensionSize = sizeof(AHCI_ADAPTER_EXTENSION); - + // register our hw init data status = StorPortInitialize( DriverObject, RegistryPath, &hwInitializationData, NULL); + StorPortDebugPrint(0, "\tstatus:%x\n", status); return status; }// -- DriverEntry(); @@ -494,7 +582,7 @@ * software sets GHC.HR to â1â and may poll until this bit is read to be â0â, at which point software knows that * the HBA reset has completed. * If the HBA has not cleared GHC.HR to â0â within 1 second of software setting GHC.HR to â1â, the HBA is in - * a hung or locked state. + * a hung or locked state. * * @param adapterExtension * @@ -538,6 +626,7 @@ * * @param buffer */ +__inline VOID AhciZeroMemory( __in PCHAR buffer, __in ULONG bufferSize @@ -547,3 +636,26 @@ for (i = 0; i < bufferSize; i++) buffer[i] = 0; }// -- AhciZeroMemory(); + +/** + * @name IsPortValid + * @implemented + * + * Tells wheather given port is implemented or not + * + * @param adapterExtension + * @param PathId + * + * @return + * return TRUE if bus was successfully reset + */ +__inline +BOOLEAN IsPortValid( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId +) +{ + if (pathId >= MAXIMUM_AHCI_PORT_COUNT) + return FALSE; + return adapterExtension->PortExtension[pathId].IsActive; +}// -- IsPortValid() Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Tue Jun 7 11:05:32 2016 @@ -4,11 +4,22 @@ * PURPOSE: To Implement AHCI Miniport driver targeting storport NT 5.2 * PROGRAMMERS: Aman Priyadarshi (aman.eureka(a)gmail.com) */ - + #include "miniport.h" #include "storport.h" #define AHCI_POOL_TAG 'ahci' +#define MAXIMUM_AHCI_PORT_COUNT 12 + +// section 3.1.2 +#define AHCI_Global_HBA_CONTROL_HR (0x1<<0) +#define AHCI_Global_HBA_CONTROL_IE (0x1<<1) +#define AHCI_Global_HBA_CONTROL_MRSM (0x1<<2) +#define AHCI_Global_HBA_CONTROL_AE (0x1<<31) + +////////////////////////////////////////////////////////////// +// ---- Support Structures --- // +////////////////////////////////////////////////////////////// typedef struct _AHCI_FIS_DMA_SETUP { @@ -24,7 +35,7 @@ ULONG Reserved2; //More reserved ULONG DmaBufferOffset; //Byte offset into buffer. First 2 bits must be 0 ULONG TranferCount; //Number of bytes to transfer. Bit 0 must be 0 - ULONG Reserved3; //Reserved + ULONG Reserved3; //Reserved } AHCI_FIS_DMA_SETUP; typedef struct _AHCI_PIO_SETUP_FIS @@ -54,12 +65,11 @@ USHORT TransferCount; UCHAR Reserved5[2]; - -} AHCI_PIO_SETUP_FIS; +} AHCI_PIO_SETUP_FIS; typedef struct _AHCI_D2H_REGISTER_FIS { - UCHAR FisType; // 0x34 + UCHAR FisType; UCHAR Reserved1 :6; UCHAR I:1; UCHAR Reserved2 :1; @@ -83,9 +93,9 @@ UCHAR Reserved4[4]; } AHCI_D2H_REGISTER_FIS; -typedef struct _AHCI_SET_DEVICE_BITS_FIS { - - UCHAR FisType; //0xA1 +typedef struct _AHCI_SET_DEVICE_BITS_FIS +{ + UCHAR FisType; UCHAR PMPort: 4; UCHAR Reserved1 :2; @@ -100,9 +110,13 @@ UCHAR Error; UCHAR Reserved5[4]; -} AHCI_SET_DEVICE_BITS_FIS; - -// 4.2.2 +} AHCI_SET_DEVICE_BITS_FIS; + +////////////////////////////////////////////////////////////// +// --------------------------- // +////////////////////////////////////////////////////////////// + +// 4.2.2 Command Header typedef struct _AHCI_COMMAND_HEADER { ULONG HEADER_DESCRIPTION; // DW 0 @@ -115,84 +129,81 @@ // Received FIS typedef struct _AHCI_RECEIVED_FIS { - AHCI_FIS_DMA_SETUP DmaSetupFIS; // 0x00 -- DMA Setup FIS - ULONG pad0; // 4 BYTE padding - AHCI_PIO_SETUP_FIS PioSetupFIS; // 0x20 -- PIO Setup FIS - ULONG pad1[3]; // 12 BYTE padding - AHCI_D2H_REGISTER_FIS RegisterFIS; // 0x40 -- Register â Device to Host FIS - ULONG pad2; // 4 BYTE padding - AHCI_SET_DEVICE_BITS_FIS SetDeviceFIS; // 0x58 -- Set Device Bit FIS - ULONG UnknowFIS[16]; // 0x60 -- Unknown FIS - ULONG Reserved[24]; // 0xA0 -- Reserved + struct _AHCI_FIS_DMA_SETUP DmaSetupFIS; // 0x00 -- DMA Setup FIS + ULONG pad0; // 4 BYTE padding + struct _AHCI_PIO_SETUP_FIS PioSetupFIS; // 0x20 -- PIO Setup FIS + ULONG pad1[3]; // 12 BYTE padding + struct _AHCI_D2H_REGISTER_FIS RegisterFIS; // 0x40 -- Register â Device to Host FIS + ULONG pad2; // 4 BYTE padding + struct _AHCI_SET_DEVICE_BITS_FIS SetDeviceFIS; // 0x58 -- Set Device Bit FIS + ULONG UnknowFIS[16]; // 0x60 -- Unknown FIS + ULONG Reserved[24]; // 0xA0 -- Reserved } AHCI_RECEIVED_FIS, *PAHCI_RECEIVED_FIS; +// Holds Port Information typedef struct _AHCI_PORT { - ULONG CLB; // 0x00, command list base address, 1K-byte aligned - ULONG CLBU; // 0x04, command list base address upper 32 bits - ULONG FB; // 0x08, FIS base address, 256-byte aligned - ULONG FBU; // 0x0C, FIS base address upper 32 bits - ULONG IS; // 0x10, interrupt status - ULONG IE; // 0x14, interrupt enable - ULONG CMD; // 0x18, command and status - ULONG RSV0; // 0x1C, Reserved - ULONG TFD; // 0x20, task file data - ULONG SIG; // 0x24, signature - ULONG SSTS; // 0x28, SATA status (SCR0:SStatus) - ULONG SCTL; // 0x2C, SATA control (SCR2:SControl) - ULONG SERR; // 0x30, SATA error (SCR1:SError) - ULONG SACT; // 0x34, SATA active (SCR3:SActive) - ULONG CI; // 0x38, command issue - ULONG SNTF; // 0x3C, SATA notification (SCR4:SNotification) - ULONG FBS; // 0x40, FIS-based switch control - ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved - ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific + ULONG CLB; // 0x00, command list base address, 1K-byte aligned + ULONG CLBU; // 0x04, command list base address upper 32 bits + ULONG FB; // 0x08, FIS base address, 256-byte aligned + ULONG FBU; // 0x0C, FIS base address upper 32 bits + ULONG IS; // 0x10, interrupt status + ULONG IE; // 0x14, interrupt enable + ULONG CMD; // 0x18, command and status + ULONG RSV0; // 0x1C, Reserved + ULONG TFD; // 0x20, task file data + ULONG SIG; // 0x24, signature + ULONG SSTS; // 0x28, SATA status (SCR0:SStatus) + ULONG SCTL; // 0x2C, SATA control (SCR2:SControl) + ULONG SERR; // 0x30, SATA error (SCR1:SError) + ULONG SACT; // 0x34, SATA active (SCR3:SActive) + ULONG CI; // 0x38, command issue + ULONG SNTF; // 0x3C, SATA notification (SCR4:SNotification) + ULONG FBS; // 0x40, FIS-based switch control + ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved + ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific } AHCI_PORT, *PAHCI_PORT; typedef struct _AHCI_MEMORY_REGISTERS { // 0x00 - 0x2B, Generic Host Control - ULONG CAP; // 0x00, Host capability - ULONG GHC; // 0x04, Global host control - ULONG IS; // 0x08, Interrupt status - ULONG PI; // 0x0C, Port implemented - ULONG VS; // 0x10, Version - ULONG CCC_CTL; // 0x14, Command completion coalescing control - ULONG CCC_PTS; // 0x18, Command completion coalescing ports - ULONG EM_LOC; // 0x1C, Enclosure management location - ULONG EM_CTL; // 0x20, Enclosure management control - ULONG CAP2; // 0x24, Host capabilities extended - ULONG BOHC; // 0x28, BIOS/OS handoff control and status - - // 0x2C - 0x9F, Reserved - ULONG Reserved[0xA0-0x2C]; - - // 0xA0 - 0xFF, Vendor specific registers - ULONG VendorSpecific[0x100-0xA0]; - - AHCI_PORT PortList[32];//1~32 + ULONG CAP; // 0x00, Host capability + ULONG GHC; // 0x04, Global host control + ULONG IS; // 0x08, Interrupt status + ULONG PI; // 0x0C, Port implemented + ULONG VS; // 0x10, Version + ULONG CCC_CTL; // 0x14, Command completion coalescing control + ULONG CCC_PTS; // 0x18, Command completion coalescing ports + ULONG EM_LOC; // 0x1C, Enclosure management location + ULONG EM_CTL; // 0x20, Enclosure management control + ULONG CAP2; // 0x24, Host capabilities extended + ULONG BOHC; // 0x28, BIOS/OS handoff control and status + ULONG Reserved[0xA0-0x2C]; // 0x2C - 0x9F, Reserved + ULONG VendorSpecific[0x100-0xA0]; // 0xA0 - 0xFF, Vendor specific registers + AHCI_PORT PortList[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_MEMORY_REGISTERS, *PAHCI_MEMORY_REGISTERS; -struct _AHCI_ADAPTER_EXTENSION; - +// Holds information for each attached attached port to a given adapter. typedef struct _AHCI_PORT_EXTENSION { ULONG PortNumber; - struct _AHCI_ADAPTER_EXTENSION* AdapterExtension; + BOOLEAN IsActive; + PAHCI_PORT Port; // AHCI Port Infomation + PAHCI_RECEIVED_FIS ReceivedFIS; PAHCI_COMMAND_HEADER CommandList; - PAHCI_RECEIVED_FIS ReceivedFIS; - PAHCI_PORT Port; + STOR_DEVICE_POWER_STATE DevicePowerState; // Device Power State + struct _AHCI_ADAPTER_EXTENSION* AdapterExtension; // Port's Adapter Information } AHCI_PORT_EXTENSION, *PAHCI_PORT_EXTENSION; +// Holds Adapter Information typedef struct _AHCI_ADAPTER_EXTENSION { - ULONG AdapterNumber; ULONG SystemIoBusNumber; ULONG SlotNumber; ULONG AhciBaseAddress; - ULONG IS; // Interrupt status - ULONG PortImplemented; + PULONG IS;// Interrupt Status, In case of MSIM == `1` + ULONG PortImplemented;// bit-mapping of ports which are implemented USHORT VendorID; USHORT DeviceID; @@ -202,10 +213,18 @@ ULONG CAP; ULONG CAP2; - PVOID NonCachedExtension; + PVOID NonCachedExtension;// holds virtual address to noncached buffer allocated for Port Extension + + struct + { + // Message per port or shared port? + ULONG MessagePerPort : 1; + ULONG Removed : 1; + ULONG Reserved : 30; // not in use -- maintain 4 byte alignment + } StateFlags; PAHCI_MEMORY_REGISTERS ABAR_Address; - AHCI_PORT_EXTENSION PortExtension[32]; + AHCI_PORT_EXTENSION PortExtension[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_ADAPTER_EXTENSION, *PAHCI_ADAPTER_EXTENSION; typedef struct _AHCI_SRB_EXTENSION

1 0

[akhaldi] 71587: [RICHED20_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 11:02:39 2016 New Revision: 71587 URL: http://svn.reactos.org/svn/reactos?rev=71587&view=rev Log: [RICHED20_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/riched20/editor.c trunk/rostests/winetests/riched20/richole.c Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… ============================================================================== --- trunk/rostests/winetests/riched20/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/editor.c [iso-8859-1] Tue Jun 7 11:02:39 2016 @@ -601,6 +601,7 @@ POINTL pt; LOCALESIGNATURE sig; BOOL rtl; + PARAFORMAT2 fmt; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -726,6 +727,18 @@ /* Try a negative position. */ SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, -1); ok(pt.x == 1, "pt.x = %d\n", pt.x); + + /* test negative indentation */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, + (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); + SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); + ok(pt.x == 1, "pt.x = %d\n", pt.x); + + fmt.cbSize = sizeof(fmt); + SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == -400, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == 200, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_LEFT, "got %d\n", fmt.wAlignment); DestroyWindow(hwndRichEdit); } @@ -3281,11 +3294,12 @@ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"x"); cr.cpMin = 0; - cr.cpMax = 1; + cr.cpMax = -1; + SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); /*Load "x" into the clipboard. Paste is an easy, undo'able operation. also, multiple pastes don't combine like WM_CHAR would */ - SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* first case - check the default */ SendMessageA(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); @@ -3808,7 +3822,7 @@ getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem2) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3823,7 +3837,7 @@ getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -5032,7 +5046,7 @@ todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); if (!redraw) - /* This is needed to avoid interferring with keybd_event calls + /* This is needed to avoid interfering with keybd_event calls * on other tests that simulate keyboard events. */ SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0); @@ -5403,9 +5417,10 @@ EDITSTREAM es; char buffer[1024] = {0}, tmp[16]; CHARRANGE range; - - const char * streamText0 = "{\\rtf1 TestSomeText}"; - const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; + PARAFORMAT2 fmt; + + const char * streamText0 = "{\\rtf1\\fi100\\li200\\rtlpar\\qr TestSomeText}"; + const char * streamText0a = "{\\rtf1\\fi100\\li200\\rtlpar\\qr TestSomeText\\par}"; const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; const char * ptr; @@ -5462,6 +5477,17 @@ ok (result == 0, "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); + /* Show that para fmts are ignored */ + range.cpMin = 2; + range.cpMax = 2; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + memset(&fmt, 0xcc, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + result = SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == 0, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == 0, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_LEFT, "got %d\n", fmt.wAlignment); + ok((fmt.wEffects & PFE_RTLPARA) == 0, "got %x\n", fmt.wEffects); /* Native richedit 2.0 ignores last \par */ ptr = streamText0a; @@ -5478,6 +5504,17 @@ ok (result == 0, "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test 0-a set error %d, expected %d\n", es.dwError, 0); + /* This time para fmts are processed */ + range.cpMin = 2; + range.cpMax = 2; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + memset(&fmt, 0xcc, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + result = SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == 300, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == -100, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_RIGHT, "got %d\n", fmt.wAlignment); + ok((fmt.wEffects & PFE_RTLPARA) == PFE_RTLPARA, "got %x\n", fmt.wEffects); /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ es.dwCookie = (DWORD_PTR)&streamText0b; @@ -8219,7 +8256,7 @@ pf.cbSize = sizeof(PARAFORMAT2); pf.dwMask = -1; SendMessageW(richedit, EM_GETPARAFORMAT, SCF_SELECTION, (LPARAM)&pf); - ok(pf.wAlignment == ES_CENTER, "got %d expected ES_CENTER\n", pf.wAlignment); + ok(pf.wAlignment == PFA_LEFT, "got %d expected PFA_LEFT\n", pf.wAlignment); DestroyWindow(richedit); } @@ -8254,6 +8291,96 @@ DestroyWindow(hwndRichEdit); } +static void test_rtf_specials(void) +{ + const char *specials = "{\\rtf1\\emspace\\enspace\\bullet\\lquote" + "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; + const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, + 0x201d,0x200e,0x200f,0x200d,0x200c}; + const char *pard = "{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"; + HWND edit = new_richeditW( NULL ); + EDITSTREAM es; + WCHAR buf[80]; + LRESULT result; + PARAFORMAT2 fmt; + + es.dwCookie = (DWORD_PTR)&specials; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + result = SendMessageW( edit, WM_GETTEXT, sizeof(buf)/sizeof(buf[0]), (LPARAM)buf ); + ok( result == sizeof(expect_specials)/sizeof(expect_specials[0]), "got %ld\n", result ); + ok( !memcmp( buf, expect_specials, sizeof(expect_specials) ), "got %s\n", wine_dbgstr_w(buf) ); + + /* Show that \rtlpar propagates to the second paragraph and is + reset by \pard in the third. */ + es.dwCookie = (DWORD_PTR)&pard; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + fmt.cbSize = sizeof(fmt); + SendMessageW( edit, EM_SETSEL, 1, 1 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 5, 5 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 9, 9 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( !(fmt.wEffects & PFE_RTLPARA), "rtl para set\n" ); + + DestroyWindow( edit ); +} + +static void test_background(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + + /* set the background color to black */ + ValidateRect(hwndRichEdit, NULL); + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); + + DestroyWindow(hwndRichEdit); +} + +static void test_window_classes(void) +{ + static const struct + { + const char *class; + BOOL success; + } test[] = + { + { "RichEdit", FALSE }, + { "RichEdit20A", TRUE }, + { "RichEdit20W", TRUE }, + { "RichEdit50A", FALSE }, + { "RichEdit50W", FALSE } + }; + int i; + HWND hwnd; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); +todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W")) + ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n", + test[i].class, test[i].success ? "succeed" : "fail"); + if (!hwnd) +todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %d\n", GetLastError()); + else + DestroyWindow(hwnd); + } +} + START_TEST( editor ) { BOOL ret; @@ -8263,6 +8390,7 @@ ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + test_window_classes(); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); test_EM_FINDTEXT(TRUE); @@ -8323,6 +8451,8 @@ test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); + test_rtf_specials(); + test_background(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. Modified: trunk/rostests/winetests/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/richol… ============================================================================== --- trunk/rostests/winetests/riched20/richole.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/richole.c [iso-8859-1] Tue Jun 7 11:02:39 2016 @@ -53,6 +53,7 @@ HWND hwnd = CreateWindowA(lpClassName, NULL, dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; } @@ -761,6 +762,65 @@ ITextRange_Release(txtRge); } +/* Helper function for testing ITextRange_ScrollIntoView */ +static void check_range(HWND w, ITextDocument* doc, int first, int lim, + LONG bStart, int expected_nonzero) +{ + SCROLLINFO si; + ITextRange *txtRge = NULL; + HRESULT hres; + + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_POS | SIF_RANGE; + + hres = ITextDocument_Range(doc, first, lim, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextRange_ScrollIntoView(txtRge, bStart); + ok(hres == S_OK, "got 0x%08x\n", hres); + GetScrollInfo(w, SB_VERT, &si); + if (expected_nonzero) { + ok(si.nPos != 0, + "Scrollbar at 0, should be >0. (TextRange %d-%d, scroll range %d-%d.)\n", + first, lim, si.nMin, si.nMax); + } else { + ok(si.nPos == 0, + "Scrollbar at %d, should be 0. (TextRange %d-%d, scroll range %d-%d.)\n", + si.nPos, first, lim, si.nMin, si.nMax); + } +} + +static void test_ITextRange_ScrollIntoView(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + static const CHAR test_text1[] = "1\n2\n3\n4\n5\n6\n7\n8\n9\n10"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + /* Scroll to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Scroll to the bottom. */ + check_range(w, txtDoc, 19, 20, tomStart, 1); + + /* Back up to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Large range */ + check_range(w, txtDoc, 0, 20, tomStart, 0); + + hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + release_interfaces(&w, &reOle, &txtDoc, NULL); + hres = ITextRange_ScrollIntoView(txtRge, tomStart); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + ITextRange_Release(txtRge); +} + static void test_ITextSelection_GetChar(void) { HWND w; @@ -3801,6 +3861,7 @@ test_ITextSelection_GetStoryLength(); test_ITextDocument_Range(); test_ITextRange_GetChar(); + test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_SetStart();

1 0

[akhaldi] 71586: [RICHED20] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 11:01:48 2016 New Revision: 71586 URL: http://svn.reactos.org/svn/reactos?rev=71586&view=rev Log: [RICHED20] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -216,9 +216,8 @@ } -static void -ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, + int *x, int *y, int *height) { ME_DisplayItem *row; ME_DisplayItem *run = pCursor->pRun; @@ -390,7 +389,7 @@ nCharsToDelete is a number of chars to delete from THIS run */ nChars -= nCharsToDelete; shift -= nCharsToDelete; - TRACE("Deleting %d (remaning %d) chars at %d in %s (%d)\n", + TRACE("Deleting %d (remaining %d) chars at %d in %s (%d)\n", nCharsToDelete, nChars, c.nOffset, debugstr_run( run ), run->len); Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -541,11 +541,6 @@ the same tags mean different things in different contexts */ void ME_RTFParAttrHook(RTF_Info *info) { - PARAFORMAT2 fmt; - fmt.cbSize = sizeof(fmt); - fmt.dwMask = 0; - fmt.wEffects = 0; - switch(info->rtfMinor) { case rtfParDef: /* restores default paragraph attributes */ @@ -553,18 +548,19 @@ info->borderType = RTFBorderParaLeft; else /* v1.0 - 3.0 */ info->borderType = RTFBorderParaTop; - fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | + info->fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | - PFM_STARTINDENT; + PFM_STARTINDENT | PFM_RTLPARA; /* TODO: numbering, shading */ - fmt.wAlignment = PFA_LEFT; - fmt.cTabCount = 0; - fmt.dxOffset = fmt.dxStartIndent = fmt.dxRightIndent = 0; - fmt.wBorderWidth = fmt.wBorders = 0; - fmt.wBorderSpace = 0; - fmt.bLineSpacingRule = 0; - fmt.dySpaceBefore = fmt.dySpaceAfter = 0; - fmt.dyLineSpacing = 0; + info->fmt.wAlignment = PFA_LEFT; + info->fmt.cTabCount = 0; + info->fmt.dxOffset = info->fmt.dxStartIndent = info->fmt.dxRightIndent = 0; + info->fmt.wBorderWidth = info->fmt.wBorders = 0; + info->fmt.wBorderSpace = 0; + info->fmt.bLineSpacingRule = 0; + info->fmt.dySpaceBefore = info->fmt.dySpaceAfter = 0; + info->fmt.dyLineSpacing = 0; + info->fmt.wEffects &= ~PFE_RTLPARA; if (!info->editor->bEmulateVersion10) /* v4.1 */ { if (info->tableDef && info->tableDef->tableRowStart && @@ -588,8 +584,8 @@ } } } else { /* v1.0 - v3.0 */ - fmt.dwMask |= PFM_TABLE; - fmt.wEffects &= ~PFE_TABLE; + info->fmt.dwMask |= PFM_TABLE; + info->fmt.wEffects &= ~PFE_TABLE; } break; case rtfNestLevel: @@ -657,197 +653,168 @@ } return; } else { /* v1.0 - v3.0 */ - fmt.dwMask |= PFM_TABLE; - fmt.wEffects |= PFE_TABLE; + info->fmt.dwMask |= PFM_TABLE; + info->fmt.wEffects |= PFE_TABLE; } break; } case rtfFirstIndent: - ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; - fmt.dxStartIndent += fmt.dxOffset + info->rtfParam; - fmt.dxOffset = -info->rtfParam; - break; case rtfLeftIndent: - ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT; - fmt.dxStartIndent = info->rtfParam - fmt.dxOffset; + if ((info->fmt.dwMask & (PFM_STARTINDENT | PFM_OFFSET)) != (PFM_STARTINDENT | PFM_OFFSET)) + { + PARAFORMAT2 fmt; + fmt.cbSize = sizeof(fmt); + ME_GetSelectionParaFormat(info->editor, &fmt); + info->fmt.dwMask |= PFM_STARTINDENT | PFM_OFFSET; + info->fmt.dxStartIndent = fmt.dxStartIndent; + info->fmt.dxOffset = fmt.dxOffset; + } + if (info->rtfMinor == rtfFirstIndent) + { + info->fmt.dxStartIndent += info->fmt.dxOffset + info->rtfParam; + info->fmt.dxOffset = -info->rtfParam; + } + else + info->fmt.dxStartIndent = info->rtfParam - info->fmt.dxOffset; break; case rtfRightIndent: - fmt.dwMask = PFM_RIGHTINDENT; - fmt.dxRightIndent = info->rtfParam; + info->fmt.dwMask |= PFM_RIGHTINDENT; + info->fmt.dxRightIndent = info->rtfParam; break; case rtfQuadLeft: case rtfQuadJust: - fmt.dwMask = PFM_ALIGNMENT; - fmt.wAlignment = PFA_LEFT; + info->fmt.dwMask |= PFM_ALIGNMENT; + info->fmt.wAlignment = PFA_LEFT; break; case rtfQuadRight: - fmt.dwMask = PFM_ALIGNMENT; - fmt.wAlignment = PFA_RIGHT; + info->fmt.dwMask |= PFM_ALIGNMENT; + info->fmt.wAlignment = PFA_RIGHT; break; case rtfQuadCenter: - fmt.dwMask = PFM_ALIGNMENT; - fmt.wAlignment = PFA_CENTER; + info->fmt.dwMask |= PFM_ALIGNMENT; + info->fmt.wAlignment = PFA_CENTER; break; case rtfTabPos: - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_TABSTOPS)) - { - fmt.cTabCount = 0; - } - if (fmt.cTabCount < MAX_TAB_STOPS && info->rtfParam < 0x1000000) - fmt.rgxTabs[fmt.cTabCount++] = info->rtfParam; - fmt.dwMask = PFM_TABSTOPS; + if (!(info->fmt.dwMask & PFM_TABSTOPS)) + { + PARAFORMAT2 fmt; + fmt.cbSize = sizeof(fmt); + ME_GetSelectionParaFormat(info->editor, &fmt); + memcpy(info->fmt.rgxTabs, fmt.rgxTabs, + fmt.cTabCount * sizeof(fmt.rgxTabs[0])); + info->fmt.cTabCount = fmt.cTabCount; + info->fmt.dwMask |= PFM_TABSTOPS; + } + if (info->fmt.cTabCount < MAX_TAB_STOPS && info->rtfParam < 0x1000000) + info->fmt.rgxTabs[info->fmt.cTabCount++] = info->rtfParam; break; case rtfKeep: - fmt.dwMask = PFM_KEEP; - fmt.wEffects = PFE_KEEP; + info->fmt.dwMask |= PFM_KEEP; + info->fmt.wEffects |= PFE_KEEP; break; case rtfNoWidowControl: - fmt.dwMask = PFM_NOWIDOWCONTROL; - fmt.wEffects = PFE_NOWIDOWCONTROL; + info->fmt.dwMask |= PFM_NOWIDOWCONTROL; + info->fmt.wEffects |= PFE_NOWIDOWCONTROL; break; case rtfKeepNext: - fmt.dwMask = PFM_KEEPNEXT; - fmt.wEffects = PFE_KEEPNEXT; + info->fmt.dwMask |= PFM_KEEPNEXT; + info->fmt.wEffects |= PFE_KEEPNEXT; break; case rtfSpaceAfter: - fmt.dwMask = PFM_SPACEAFTER; - fmt.dySpaceAfter = info->rtfParam; + info->fmt.dwMask |= PFM_SPACEAFTER; + info->fmt.dySpaceAfter = info->rtfParam; break; case rtfSpaceBefore: - fmt.dwMask = PFM_SPACEBEFORE; - fmt.dySpaceBefore = info->rtfParam; + info->fmt.dwMask |= PFM_SPACEBEFORE; + info->fmt.dySpaceBefore = info->rtfParam; break; case rtfSpaceBetween: - fmt.dwMask = PFM_LINESPACING; + info->fmt.dwMask |= PFM_LINESPACING; if ((int)info->rtfParam > 0) { - fmt.dyLineSpacing = info->rtfParam; - fmt.bLineSpacingRule = 3; + info->fmt.dyLineSpacing = info->rtfParam; + info->fmt.bLineSpacingRule = 3; } else { - fmt.dyLineSpacing = info->rtfParam; - fmt.bLineSpacingRule = 4; + info->fmt.dyLineSpacing = info->rtfParam; + info->fmt.bLineSpacingRule = 4; } break; case rtfSpaceMultiply: - fmt.dwMask = PFM_LINESPACING; - fmt.dyLineSpacing = info->rtfParam * 20; - fmt.bLineSpacingRule = 5; + info->fmt.dwMask |= PFM_LINESPACING; + info->fmt.dyLineSpacing = info->rtfParam * 20; + info->fmt.bLineSpacingRule = 5; break; case rtfParBullet: - fmt.dwMask = PFM_NUMBERING; - fmt.wNumbering = PFN_BULLET; + info->fmt.dwMask |= PFM_NUMBERING; + info->fmt.wNumbering = PFN_BULLET; break; case rtfParSimple: - fmt.dwMask = PFM_NUMBERING; - fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + info->fmt.dwMask |= PFM_NUMBERING; + info->fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ break; case rtfParNumDecimal: - fmt.dwMask = PFM_NUMBERING; - fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + info->fmt.dwMask |= PFM_NUMBERING; + info->fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ break; case rtfParNumIndent: - fmt.dwMask = PFM_NUMBERINGTAB; - fmt.wNumberingTab = info->rtfParam; + info->fmt.dwMask |= PFM_NUMBERINGTAB; + info->fmt.wNumberingTab = info->rtfParam; break; case rtfParNumStartAt: - fmt.dwMask = PFM_NUMBERINGSTART; - fmt.wNumberingStart = info->rtfParam; + info->fmt.dwMask |= PFM_NUMBERINGSTART; + info->fmt.wNumberingStart = info->rtfParam; break; case rtfBorderLeft: info->borderType = RTFBorderParaLeft; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 1; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 1; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderRight: info->borderType = RTFBorderParaRight; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 2; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 2; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderTop: info->borderType = RTFBorderParaTop; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 4; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 4; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderBottom: info->borderType = RTFBorderParaBottom; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderSingle: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 1 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 1 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderThick: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 2 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 2 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderShadow: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 10 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 10 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderDouble: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 7 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 7 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderDot: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 11 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 11 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderWidth: { int borderSide = info->borderType & RTFBorderSideMask; RTFTable *tableDef = info->tableDef; - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorderWidth |= ((info->rtfParam / 15) & 7) << 8; if ((info->borderType & RTFBorderTypeMask) == RTFBorderTypeCell) { RTFBorder *border; @@ -857,14 +824,13 @@ border->width = info->rtfParam; break; } - fmt.dwMask = PFM_BORDER; + info->fmt.wBorderWidth = info->rtfParam; + info->fmt.dwMask |= PFM_BORDER; break; } case rtfBorderSpace: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorderSpace = info->rtfParam; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorderSpace = info->rtfParam; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderColor: { @@ -891,18 +857,13 @@ break; } case rtfRTLPar: - fmt.dwMask = PFM_RTLPARA; - fmt.wEffects = PFE_RTLPARA; + info->fmt.dwMask |= PFM_RTLPARA; + info->fmt.wEffects |= PFE_RTLPARA; break; case rtfLTRPar: - fmt.dwMask = PFM_RTLPARA; - fmt.wEffects = 0; + info->fmt.dwMask = PFM_RTLPARA; + info->fmt.wEffects &= ~PFE_RTLPARA; break; - } - if (fmt.dwMask) { - RTFFlushOutputBuffer(info); - /* FIXME too slow ? how come ?*/ - ME_SetSelectionParaFormat(info->editor, &fmt); } } @@ -3662,7 +3623,6 @@ editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - ITextHost_TxViewChange(editor->texthost, TRUE); return lColor; } case EM_GETMODIFY: Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -227,6 +227,7 @@ int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -956,7 +956,7 @@ rc.right = rc.left + run->nWidth; rc.top = c->pt.y + para->pt.y + run->pt.y; rc.bottom = rc.top + height; - TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom); + TRACE("rc = %s\n", wine_dbgstr_rect(&rc)); FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -506,7 +506,7 @@ DUMP(PFM_STYLE, "Text style:", "%d", sStyle); DUMP(PFM_LINESPACING, "Line spacing rule:", "%u", bLineSpacingRule); /* bOutlineLevel should be 0 */ - DUMP(PFM_SHADING, "Shading Weigth:", "%u", wShadingWeight); + DUMP(PFM_SHADING, "Shading Weight:", "%u", wShadingWeight); DUMP(PFM_SHADING, "Shading Style:", "%u", wShadingStyle); DUMP(PFM_NUMBERINGSTART, "Numbering Start:", "%u", wNumberingStart); DUMP(PFM_NUMBERINGSTYLE, "Numbering Style:", "0x%x", wNumberingStyle); Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -258,6 +258,9 @@ info->nestingLevel = 0; info->canInheritInTbl = FALSE; info->borderType = 0; + + memset(&info->fmt, 0, sizeof(info->fmt)); + info->fmt.cbSize = sizeof(info->fmt); } /* @@ -2505,6 +2508,10 @@ case rtfPage: case rtfSect: case rtfPar: + RTFFlushOutputBuffer(info); + ME_SetSelectionParaFormat(info->editor, &info->fmt); + memset(&info->fmt, 0, sizeof(info->fmt)); + info->fmt.cbSize = sizeof(info->fmt); RTFPutUnicodeChar (info, '\r'); if (info->editor->bEmulateVersion10) RTFPutUnicodeChar (info, '\n'); break; @@ -2526,6 +2533,12 @@ case rtfEnDash: RTFPutUnicodeChar (info, 0x2013); break; + case rtfEmSpace: + RTFPutUnicodeChar (info, ' '); + break; + case rtfEnSpace: + RTFPutUnicodeChar (info, ' '); + break; case rtfLQuote: RTFPutUnicodeChar (info, 0x2018); break; @@ -2538,6 +2551,18 @@ case rtfRDblQuote: RTFPutUnicodeChar (info, 0x201D); break; + case rtfLTRMark: + RTFPutUnicodeChar (info, 0x200E); + break; + case rtfRTLMark: + RTFPutUnicodeChar (info, 0x200F); + break; + case rtfNoWidthJoiner: + RTFPutUnicodeChar (info, 0x200D); + break; + case rtfNoWidthNonJoiner: + RTFPutUnicodeChar (info, 0x200C); + break; } } Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… ============================================================================== --- trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -2445,13 +2445,29 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { ITextRangeImpl *This = impl_from_ITextRange(me); - - FIXME("(%p)->(%d): stub\n", This, value); - - if (!This->child.reole) - return CO_E_RELEASED; - - return E_NOTIMPL; + ME_TextEditor *editor; + ME_Cursor cursor; + int x, y, height; + + TRACE("(%p)->(%d)\n", This, value); + + if (!This->child.reole) + return CO_E_RELEASED; + + editor = This->child.reole->editor; + + switch (value) + { + case tomStart: + ME_CursorFromCharOfs(editor, This->start, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; + default: + FIXME("bStart value %d not handled\n", value); + return E_NOTIMPL; + } + ME_ScrollAbs(editor, x, y); + return S_OK; } static HRESULT WINAPI ITextRange_fnGetEmbeddedObject(ITextRange *me, IUnknown **ppv) Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -1171,6 +1171,8 @@ int nestingLevel; BOOL canInheritInTbl; int borderType; /* value corresponds to the RTFBorder constants. */ + + PARAFORMAT2 fmt; /* Accumulated para fmt for current paragraph. */ }; Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -404,10 +404,7 @@ ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE, ES_LEFT); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat.left = 0; - ITextImpl->editor->rcFormat.top = 0; - ITextImpl->editor->rcFormat.right = 0; - ITextImpl->editor->rcFormat.bottom = 0; + SetRectEmpty(&ITextImpl->editor->rcFormat); if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter; Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -746,6 +746,11 @@ assert( p->type == diParagraph ); + if (para->pFmt->dwMask & PFM_RTLPARA && para->pFmt->wEffects & PFE_RTLPARA) + state.uBidiLevel = 1; + + TRACE( "Base embedding level %d\n", state.uBidiLevel ); + while (1) { hr = ScriptItemize( para->text->szData, para->text->nLen, items_passed, &control, @@ -874,6 +879,11 @@ wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, pFmt->dxOffset); wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); + + if (wc.nFirstMargin < 0) + wc.nFirstMargin = 0; + if (wc.nLeftMargin < 0) + wc.nLeftMargin = 0; } if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) 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] Tue Jun 7 11:01:48 2016 @@ -161,7 +161,7 @@ reactos/dll/win32/query # Synced to WineStaging-1.9.4 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/resutils # Synced to WineStaging-1.9.4 -reactos/dll/win32/riched20 # Synced to WineStaging-1.9.4 +reactos/dll/win32/riched20 # Synced to WineStaging-1.9.11 reactos/dll/win32/riched32 # Synced to WineStaging-1.9.4 reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.4 reactos/dll/win32/rsabase # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71585: [MSVFW32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:59:18 2016 New Revision: 71585 URL: http://svn.reactos.org/svn/reactos?rev=71585&view=rev Log: [MSVFW32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/msvfw32/msvfw.c Modified: trunk/rostests/winetests/msvfw32/msvfw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/msvfw.c… ============================================================================== --- trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] Tue Jun 7 10:59:18 2016 @@ -25,6 +25,11 @@ #include "wine/test.h" +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} + static void test_OpenCase(void) { HIC h; @@ -88,6 +93,7 @@ { static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8, 0,100000,100000, 0,0}; static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB, 0,100000,100000, 0,0}; + BITMAPINFOHEADER tmp = {sizeof(BITMAPINFOHEADER)}; HIC h; DWORD err; @@ -122,6 +128,45 @@ err = ICDecompressQuery(h, &bi, &bo); ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); bo.biHeight = -bo.biHeight; + + bi.biWidth = 17; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biWidth = 32; ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); @@ -201,6 +246,50 @@ err = ICDecompressQuery(h, &bi, &bo); todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n", err); bo.biHeight = -bo.biHeight; + + bo.biBitCount = 24; + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); + bo.biBitCount = 16; + + bi.biWidth = 553; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %d\n", + get_stride(552, 8) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %d\n", + get_stride(552, 16) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biHeight = 17; + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight); + bi.biHeight = 8; + + bi.biWidth = 32; bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); @@ -285,9 +374,294 @@ ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } +struct msg_result +{ + int msg_index; + UINT msg; + BOOL output_format; + int width; + int height; + int bits; + int compression; + LRESULT result; + BOOL todo; +}; + +static struct msg_result expected_msgs[] = +{ + /* Wine bug - shouldn't be called */ + { 0, DRV_LOAD, FALSE, 0, 0, 0, 0, TRUE, TRUE}, + { 0, DRV_ENABLE, FALSE, 0, 0, 0, 0, 0, TRUE}, + + { 0, DRV_OPEN, FALSE, 0, 0, 0, 0, 0xdeadbeef, FALSE}, + + /* test 1 */ + { 1, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + { 2, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 3, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 4, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 5, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_BITFIELDS, ICERR_BADFORMAT, FALSE}, + { 6, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 24, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 7, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 8, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 2 */ + { 9, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {10, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + {11, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB, ICERR_BADFORMAT, FALSE}, + {12, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB, ICERR_OK, FALSE}, + + /* test 3 */ + {13, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {14, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {15, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB, ICERR_BADFORMAT, FALSE}, + {16, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB, ICERR_OK, FALSE}, + + /* test 4 */ + {17, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {18, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + {19, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 24, BI_RGB, ICERR_BADFORMAT, FALSE}, + {20, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_BADFORMAT, FALSE}, + {21, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 5 */ + {22, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {23, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {24, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 6 */ + {25, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {26, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {27, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 7 */ + {28, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {29, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {30, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 9, BI_RGB, ICERR_BADFORMAT, FALSE}, + {31, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_BADFORMAT, FALSE}, + {32, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 8 */ + {33, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {34, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {35, ICM_DECOMPRESS_QUERY, TRUE, 800, 600, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 9 */ + {36, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {37, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {38, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 10 */ + {39, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {40, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {41, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 11 */ + {42, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {43, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {44, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 8, BI_RGB, ICERR_OK, FALSE}, + {45, ICM_DECOMPRESS_GET_PALETTE, FALSE, 0, 0, 0, 0, ICERR_UNSUPPORTED, FALSE}, + + /* test 12 */ + {46, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {47, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {48, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 16, BI_RGB, ICERR_OK, FALSE}, + + /* test 13 */ + {49, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {50, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {51, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 24, BI_RGB, ICERR_OK, FALSE}, + + /* test 14 */ + {52, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {53, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {54, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 4, BI_RGB, ICERR_OK, FALSE}, + + /* Wine bug - shouldn't be called */ + {55, DRV_DISABLE, FALSE, 0, 0, 0, 0, ICERR_OK, TRUE}, + {55, DRV_FREE, FALSE, 0, 0, 0, 0, ICERR_OK, TRUE}, +}; + +static int msg_index = 0; + +static struct msg_result *get_expected_msg(UINT msg) +{ + int i = 0; + for(; i < sizeof(expected_msgs) / sizeof(expected_msgs[0]); i++) + { + if (expected_msgs[i].msg_index == msg_index && expected_msgs[i].msg == msg) + return &expected_msgs[i]; + } + return NULL; +} + +LRESULT WINAPI driver_proc_test(DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, + LPARAM lParam1, LPARAM lParam2) +{ + struct msg_result *expected = get_expected_msg(msg); + LRESULT res = expected ? expected->result : ICERR_UNSUPPORTED; + + if (msg == DRV_CLOSE) + return ICERR_OK; + + if (!expected) + { + ok(0, "unexpected message: %04x %ld %ld at msg index %d\n", + msg, lParam1, lParam2, msg_index); + return ICERR_UNSUPPORTED; + } + else if (expected->todo) + { + todo_wine ok(0, "unexpected message: %04x %ld %ld at msg index %d\n", + msg, lParam1, lParam2, msg_index); + return res; + } + + switch (msg) + { + case ICM_DECOMPRESS_QUERY: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lParam2; + + if (!lParam2) + { + trace("query -> without format\n"); + ok(!expected->output_format, "Expected no output format pointer\n"); + break; + } + + ok(expected->output_format, "Expected output format pointer\n"); + ok(out->biWidth == expected->width, + "Expected width %d, got %d\n", expected->width, out->biWidth); + ok(out->biHeight == expected->height, + "Expected height %d, got %d\n", expected->height, out->biHeight); + ok(out->biBitCount == expected->bits, + "Expected biBitCount %d, got %d\n", expected->bits, out->biBitCount); + ok(out->biCompression == expected->compression, + "Expected compression %d, got %d\n", expected->compression, out->biCompression); + ok(out->biSizeImage == get_stride(out->biWidth, out->biBitCount) * out->biHeight, + "Expected biSizeImage %d, got %d\n", get_stride(out->biWidth, out->biBitCount) * out->biHeight, + out->biSizeImage); + + trace("query -> width: %d, height: %d, bit: %d, compression: %d, size: %d\n", + out->biWidth, out->biHeight, out->biBitCount, out->biCompression, out->biSizeImage); + break; + } + + case ICM_DECOMPRESS_GET_FORMAT: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lParam2; + + if (!lParam2) + { + trace("format -> without format\n"); + ok(!expected->output_format, "Expected no output format pointer\n"); + break; + } + + ok(expected->output_format, "Expected output format pointer\n"); + ok(out->biWidth == expected->width, + "Expected width %d, got %d\n", expected->width, out->biWidth); + ok(out->biHeight == expected->height, + "Expected height %d, got %d\n", expected->height, out->biHeight); + ok(out->biBitCount == expected->bits, + "Expected biBitCount %d, got %d\n", expected->bits, out->biBitCount); + ok(out->biCompression == expected->compression, + "Expected compression %d, got %d\n", expected->compression, out->biCompression); + + trace("format -> width: %d, height: %d, bit: %d, compression: %d, size: %d\n", + out->biWidth, out->biHeight, out->biBitCount, out->biCompression, out->biSizeImage); + + out->biBitCount = 64; + break; + } + } + + msg_index++; + return res; +} + + +void test_ICGetDisplayFormat(void) +{ + static const struct + { + int bits_wanted; + int bits_expected; + int dx; + int width_expected; + int dy; + int height_expected; + int msg_index; + } + tests[] = + { + { 8, 64, 0, 640, 0, 480, 9}, + { 8, 16, 0, 640, 0, 480, 13}, + { 8, 16, 0, 640, 0, 480, 17}, + {24, 64, 0, 640, 0, 480, 22}, + {32, 32, 0, 640, 0, 480, 25}, + { 0, 32, 0, 640, 0, 480, 28}, + { 9, 64, 0, 640, 0, 480, 33}, + {32, 32, 800, 800, 600, 600, 36}, + {32, 32, -1, 640, -1, 480, 39}, + {32, 32, -90, 640, -60, 480, 42}, + { 8, 8, 270, 270, 270, 270, 46}, + {16, 16, 270, 270, 270, 270, 49}, + {24, 24, 270, 270, 270, 270, 52}, + { 4, 4, 0, 640, 0, 480, 55}, + }; + + HIC ic, ic2; + BITMAPINFOHEADER in; + BITMAPINFOHEADER out; + int real_depth; + int i; + + ic = ICOpenFunction(ICTYPE_VIDEO, 0xdeadbeef, ICMODE_DECOMPRESS, driver_proc_test); + ok(!!ic, "Opening driver failed\n"); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + memset(&in, 0, sizeof(in)); + memset(&out, 0, sizeof(out)); + + in.biSize = sizeof(in); + in.biWidth = 640; + in.biHeight = 480; + in.biPlanes = 1; + in.biBitCount = 32; + in.biCompression = BI_PNG; + in.biSizeImage = 1024; + + out.biBitCount = 16; + out.biWidth = 320; + out.biHeight = 240; + + ic2 = ICGetDisplayFormat(ic, &in, &out, tests[i].bits_wanted, tests[i].dx, tests[i].dy); + ok(!!ic2, "Expected ICGetDisplayFormat to succeeded\n"); + + ok(out.biBitCount == tests[i].bits_expected, + "Expected biBitCount %d, got %d\n", tests[i].bits_expected, out.biBitCount); + ok(out.biWidth == tests[i].width_expected, + "Expected biWidth %d, got %d\n", tests[i].width_expected, out.biWidth); + ok(out.biHeight == tests[i].height_expected, + "Expected biHeight %d, got %d\n", tests[i].height_expected, out.biHeight); + real_depth = (out.biBitCount > 32) ? 32 : out.biBitCount; + ok(out.biSizeImage == get_stride(out.biWidth, real_depth) * out.biHeight, + "Expected biSizeImage %d, got %d\n", get_stride(out.biWidth, real_depth) * out.biHeight, + out.biSizeImage); + ok(msg_index == tests[i].msg_index, + "Expected msg_index %d, got %d\n", tests[i].msg_index, msg_index); + } + + ICClose(ic); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); -} + test_ICGetDisplayFormat(); +}

1 0

[akhaldi] 71584: [OPENGL32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:58:19 2016 New Revision: 71584 URL: http://svn.reactos.org/svn/reactos?rev=71584&view=rev Log: [OPENGL32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/opengl32/opengl.c Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Tue Jun 7 10:58:19 2016 @@ -389,7 +389,7 @@ res = wglMakeCurrent(winhdc, hglrc2); ok(res, "Make current failed\n"); res = wglShareLists(hglrc1, hglrc2); - todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); + ok(res, "Sharing display lists with a destination context which has been made current failed\n"); wglMakeCurrent(0, 0); wglDeleteContext(hglrc2); }

1 0

[akhaldi] 71583: [QMGR] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:55:17 2016 New Revision: 71583 URL: http://svn.reactos.org/svn/reactos?rev=71583&view=rev Log: [QMGR] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/qmgr/file.c trunk/reactos/dll/win32/qmgr/job.c trunk/reactos/dll/win32/qmgr/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] Tue Jun 7 10:55:17 2016 @@ -412,7 +412,8 @@ WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); - if (!ret) DeleteFileW(tmpfile); + if (!ret && !transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_ERROR)) + transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); SetEvent(job->done); return ret; @@ -513,17 +514,15 @@ uc.nPort = 0; uc.lpszUrlPath = NULL; uc.dwUrlPathLength = ~0u; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) { TRACE("WinHttpCrackUrl failed, trying local file copy\n"); - if (!transfer_file_local(file, tmpName)) return FALSE; - } - else if (!transfer_file_http(file, &uc, tmpName)) - { - WARN("HTTP transfer failed\n"); - return FALSE; - } + if (!transfer_file_local(file, tmpName)) WARN("local transfer failed\n"); + } + else if (!transfer_file_http(file, &uc, tmpName)) WARN("HTTP transfer failed\n"); if (transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_QUEUED) || transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_QUEUED)) Modified: trunk/reactos/dll/win32/qmgr/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/job.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] Tue Jun 7 10:55:17 2016 @@ -364,6 +364,12 @@ && This->state != BG_JOB_STATE_TRANSFERRING) { This->state = BG_JOB_STATE_QUEUED; + This->error.context = This->error.code = 0; + if (This->error.file) + { + IBackgroundCopyFile2_Release(This->error.file); + This->error.file = NULL; + } SetEvent(globalMgr.jobEvent); } LeaveCriticalSection(&globalMgr.cs); Modified: trunk/reactos/dll/win32/qmgr/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/service.c?r… ============================================================================== --- trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] Tue Jun 7 10:55:17 2016 @@ -143,7 +143,7 @@ WaitForSingleObject(fileTxThread, INFINITE); UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); CloseHandle(stop_event); - TRACE("service stoped\n"); + TRACE("service stopped\n"); CoUninitialize(); } 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] Tue Jun 7 10:55:17 2016 @@ -156,7 +156,7 @@ reactos/dll/win32/printui # Synced to WineStaging-1.9.4 reactos/dll/win32/propsys # Synced to WineStaging-1.9.4 reactos/dll/win32/pstorec # Synced to WineStaging-1.9.4 -reactos/dll/win32/qmgr # Synced to WineStaging-1.9.4 +reactos/dll/win32/qmgr # Synced to WineStaging-1.9.11 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.4 reactos/dll/win32/query # Synced to WineStaging-1.9.4 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71582: [OLEAUT32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:53:40 2016 New Revision: 71582 URL: http://svn.reactos.org/svn/reactos?rev=71582&view=rev Log: [OLEAUT32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/oleaut32/olefont.c trunk/rostests/winetests/oleaut32/olepicture.c trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c Modified: trunk/rostests/winetests/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olefon… ============================================================================== --- trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -63,9 +63,8 @@ /* SetRatio to ratio_logical, ratio_himetric, */ /* check that resulting hfont has height hfont_height. */ /* Various checks along the way. */ -static void test_ifont_size(LONG lo_size, LONG hi_size, - LONG ratio_logical, LONG ratio_himetric, - LONG hfont_height, const char * test_name) +static void test_ifont_size(LONGLONG size, LONG ratio_logical, LONG ratio_himetric, + LONG hfont_height, const char * test_name) { FONTDESC fd; LPVOID pvObj = NULL; @@ -78,8 +77,7 @@ fd.cbSizeofstruct = sizeof(FONTDESC); fd.lpstrName = arial_font; /* using scalable instead of bitmap font reduces errors due to font realization */ - S(fd.cySize).Lo = lo_size; - S(fd.cySize).Hi = hi_size; + fd.cySize.int64 = size; fd.sWeight = 0; fd.sCharset = 0; fd.fItalic = FALSE; @@ -104,9 +102,9 @@ test_name, hres); /* Check returned size - allow for errors due to rounding & font realization. */ - ok((abs(S(psize).Lo - lo_size) < 10000) && S(psize).Hi == hi_size, + ok((psize.int64 - size) < 10000 && (psize.int64 - size) > -10000, "%s: IFont_get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=%d.\n", - test_name, S(psize).Lo, S(psize).Hi, lo_size, hi_size); + test_name, S(psize).Lo, S(psize).Hi, fd.cySize.Lo, fd.cySize.Hi); /* Check hFont size. */ hres = IFont_get_hFont (ifnt, &hfont); @@ -135,59 +133,59 @@ ReleaseDC(0, hdc); if(dpi == 96) /* normal resolution display */ { - test_ifont_size(180000, 0, 0, 0, -24, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -25, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -24, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -25, "rounding"); /* test rounding */ } else if(dpi == 72) /* low resolution display */ { - test_ifont_size(180000, 0, 0, 0, -18, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -19, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -18, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -19, "rounding"); /* test rounding */ } else if(dpi == 120) /* high resolution display */ { - test_ifont_size(180000, 0, 0, 0, -30, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -31, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -30, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -31, "rounding"); /* test rounding */ } else skip("Skipping resolution dependent font size tests - display resolution is %d\n", dpi); /* Next 4 tests specify a scaling ratio, so display resolution is not a factor. */ - test_ifont_size(180000, 0, 72, 2540, -18, "ratio1"); /* change ratio */ - test_ifont_size(180000, 0, 144, 2540, -36, "ratio2"); /* another ratio */ - test_ifont_size(180000, 0, 72, 1270, -36, "ratio3"); /* yet another ratio */ - test_ifont_size(186000, 0, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ + test_ifont_size(180000, 72, 2540, -18, "ratio1"); /* change ratio */ + test_ifont_size(180000, 144, 2540, -36, "ratio2"); /* another ratio */ + test_ifont_size(180000, 72, 1270, -36, "ratio3"); /* yet another ratio */ + test_ifont_size(186000, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ /* test various combinations of logical == himetric */ - test_ifont_size(180000, 0, 10, 10, -635, "identical ratio 1"); - test_ifont_size(240000, 0, 10, 10, -848, "identical ratio 2"); - test_ifont_size(300000, 0, 10, 10, -1058, "identical ratio 3"); + test_ifont_size(180000, 10, 10, -635, "identical ratio 1"); + test_ifont_size(240000, 10, 10, -848, "identical ratio 2"); + test_ifont_size(300000, 10, 10, -1058, "identical ratio 3"); /* test various combinations of logical and himetric both set to 1 */ - test_ifont_size(180000, 0, 1, 1, -24, "1:1 ratio 1"); - test_ifont_size(240000, 0, 1, 1, -32, "1:1 ratio 2"); - test_ifont_size(300000, 0, 1, 1, -40, "1:1 ratio 3"); + test_ifont_size(180000, 1, 1, -24, "1:1 ratio 1"); + test_ifont_size(240000, 1, 1, -32, "1:1 ratio 2"); + test_ifont_size(300000, 1, 1, -40, "1:1 ratio 3"); /* test various combinations of logical set to 1 */ - test_ifont_size(180000, 0, 1, 0, -24, "1:0 ratio 1"); - test_ifont_size(240000, 0, 1, 0, -32, "1:0 ratio 2"); - test_ifont_size(300000, 0, 1, 0, -40, "1:0 ratio 3"); + test_ifont_size(180000, 1, 0, -24, "1:0 ratio 1"); + test_ifont_size(240000, 1, 0, -32, "1:0 ratio 2"); + test_ifont_size(300000, 1, 0, -40, "1:0 ratio 3"); /* test various combinations of himetric set to 1 */ - test_ifont_size(180000, 0, 0, 1, -24, "0:1 ratio 1"); - test_ifont_size(240000, 0, 0, 1, -32, "0:1 ratio 2"); - test_ifont_size(300000, 0, 0, 1, -40, "0:1 ratio 3"); + test_ifont_size(180000, 0, 1, -24, "0:1 ratio 1"); + test_ifont_size(240000, 0, 1, -32, "0:1 ratio 2"); + test_ifont_size(300000, 0, 1, -40, "0:1 ratio 3"); /* test various combinations of 2:1 logical:himetric */ - test_ifont_size(180000, 0, 2, 1, -1270, "2:1 ratio 1"); - test_ifont_size(240000, 0, 2, 1, -1694, "2:1 ratio 2"); - test_ifont_size(300000, 0, 2, 1, -2117, "2:1 ratio 3"); + test_ifont_size(180000, 2, 1, -1270, "2:1 ratio 1"); + test_ifont_size(240000, 2, 1, -1694, "2:1 ratio 2"); + test_ifont_size(300000, 2, 1, -2117, "2:1 ratio 3"); /* test various combinations of 1:2 logical:himetric */ - test_ifont_size(180000, 0, 1, 2, -318, "1:2 ratio 1"); - test_ifont_size(240000, 0, 1, 2, -424, "1:2 ratio 2"); - test_ifont_size(300000, 0, 1, 2, -529, "1:2 ratio 3"); + test_ifont_size(180000, 1, 2, -318, "1:2 ratio 1"); + test_ifont_size(240000, 1, 2, -424, "1:2 ratio 2"); + test_ifont_size(300000, 1, 2, -529, "1:2 ratio 3"); /* test various combinations of logical and himetric both set to 2 */ - test_ifont_size(180000, 0, 2, 2, -635, "2:2 ratio 1"); - test_ifont_size(240000, 0, 2, 2, -848, "2:2 ratio 2"); - test_ifont_size(300000, 0, 2, 2, -1058, "2:2 ratio 3"); + test_ifont_size(180000, 2, 2, -635, "2:2 ratio 1"); + test_ifont_size(240000, 2, 2, -848, "2:2 ratio 2"); + test_ifont_size(300000, 2, 2, -1058, "2:2 ratio 3"); } static void test_QueryInterface(void) Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… ============================================================================== --- trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -225,7 +225,7 @@ { BITMAP bmp; GetObjectA(UlongToHandle(handle), sizeof(BITMAP), &bmp); - todo_wine ok(bmp.bmBits != 0, "not a dib\n"); + ok(bmp.bmBits != 0, "not a dib\n"); } width = 0; @@ -854,6 +854,7 @@ HANDLE file; DWORD size; WCHAR *ptr; + VARIANT var; const struct { @@ -920,6 +921,14 @@ if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW + 8); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == S_OK, "OleLoadPictureFile error %#x\n", hres); + IPicture_Release(pic); + VariantClear(&var); + /* Try a DOS path with tacked on "file:". */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || @@ -928,6 +937,13 @@ if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); + DeleteFileA(temp_file); /* Try with a nonexistent file. */ @@ -937,11 +953,25 @@ broken(hres == E_FAIL), /*Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW + 8); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_FILENOTFOUND, "wrong error %#x\n", hres); + VariantClear(&var); + hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -964,6 +994,13 @@ if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); + DeleteFileA(temp_file); /* Try with a nonexistent file. */ @@ -972,6 +1009,22 @@ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); + + VariantInit(&var); + V_VT(&var) = VT_INT; + V_INT(&var) = 762; + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_FILENOTFOUND, "wrong error %#x\n", hres); + +if (0) /* crashes under Windows */ + hres = OleLoadPictureFile(var, NULL); } static void test_himetric(void) @@ -1083,18 +1136,14 @@ size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1161,15 +1210,12 @@ todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1235,13 +1281,11 @@ size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); @@ -1307,6 +1351,89 @@ } /* Non-statable impl always deletes on release */ IStream_Release(stream); +} + +static void test_load_save_emf(void) +{ + HDC hdc; + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + ENHMETAHEADER *emh; + IPersistStream *src_stream; + IStream *dst_stream; + LARGE_INTEGER offset; + HRESULT hr; + LONG size; + + hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); + ok(hdc != 0, "CreateEnhMetaFileA failed\n"); + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_ENHMETAFILE; + desc.u.emf.hemf = CloseEnhMetaFile(hdc); + ok(desc.u.emf.hemf != 0, "CloseEnhMetaFile failed\n"); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_ENHMETAFILE,"expected PICTYPE_ENHMETAFILE, got %d\n", type); + + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(IntToPtr(handle) == desc.u.emf.hemf, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_MOVEABLE, 0); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); + ok(size == 128, "expected 128, got %d\n", size); + emh = GlobalLock(hmem); +if (size) +{ + ok(emh->iType == EMR_HEADER, "wrong iType %04x\n", emh->iType); + ok(emh->dSignature == ENHMETA_SIGNATURE, "wrong dSignature %08x\n", emh->dSignature); +} + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); + ok(hr == S_OK, "Save error %#x\n", hr); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + mem = GlobalLock(hmem); + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); + ok(mem[1] == 128, "expected 128, got %u\n", mem[1]); + emh = (ENHMETAHEADER *)(mem + 2); + ok(emh->iType == EMR_HEADER, "wrong iType %04x\n", emh->iType); + ok(emh->dSignature == ENHMETA_SIGNATURE, "wrong dSignature %08x\n", emh->dSignature); + + GlobalUnlock(hmem); + GlobalFree(hmem); + + DeleteEnhMetaFile(desc.u.emf.hemf); + IPicture_Release(pic); } START_TEST(olepicture) @@ -1348,6 +1475,7 @@ test_load_save_bmp(); test_load_save_icon(); test_load_save_empty_picture(); + test_load_save_emf(); } Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -5712,19 +5712,23 @@ hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); + tl = NULL; hr = LoadRegTypeLib(&LIBID_TestTypelib, 0xffff, 0xffff, LOCALE_NEUTRAL, &tl); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITypeLib_GetLibAttr(tl, &attr); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ok(attr->lcid == 0, "got %x\n", attr->lcid); - ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); - ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); - ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); - - ITypeLib_ReleaseTLibAttr(tl, attr); - ITypeLib_Release(tl); + if (tl) + { + hr = ITypeLib_GetLibAttr(tl, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(attr->lcid == 0, "got %x\n", attr->lcid); + ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); + ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); + ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); + + ITypeLib_ReleaseTLibAttr(tl, attr); + ITypeLib_Release(tl); + } DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb2.tlb"); Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -2548,7 +2548,7 @@ hres = pVarSub(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VarSub: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0), + ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0.0), "VarSub: BSTR + BSTR, expected %f got %f\n", 0.0, V_R8(&result)); /* Manually test some VT_CY and VT_DECIMAL variants */ @@ -2569,7 +2569,7 @@ ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4702), + ok(hres == S_OK && EQ_DOUBLE(r, 4702.0), "VarSub: CY value %f, expected %f\n", r, (double)4720); hres = pVarSub(&left, &dec, &result); @@ -5388,7 +5388,7 @@ hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399); + ok(hres == S_OK && EQ_DOUBLE(r, 42399.0), "VarMul: CY value %f, expected %f\n", r, (double)42399); hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); @@ -5559,7 +5559,7 @@ hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); + ok(hres == S_OK && EQ_DOUBLE(r, 1212.0), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); VariantClear(&result); /* Manuly test some VT_CY and VT_DECIMAL variants */ @@ -5579,7 +5579,7 @@ hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720); + ok(hres == S_OK && EQ_DOUBLE(r, 4720.0), "VarAdd: CY value %f, expected %f\n", r, (double)4720); hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -3533,6 +3533,9 @@ DFS("1-2-1970"); EXPECT_DBL(25570.0); DFS("13-1-1970"); EXPECT_DBL(25581.0); DFS("1970-1-13"); EXPECT_DBL(25581.0); + DFS("6/30/2011 01:20:34"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 AM"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a non-english data string */

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