wine-devel November 2019

wine-devel@winehq.org

85 participants
778 discussions

[PATCH v3] include: update definitions in ras.h
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

v3: fix definitions of in_addr and in6_addr v2: fix build errors Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/ras.h | 335 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 287 insertions(+), 48 deletions(-) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6db..fea02dfc516f 100644 --- a/include/ras.h +++ b/include/ras.h @@ -1,5 +1,6 @@ /* * Copyright (C) 1998 Marcus Meissner + * Copyright (C) 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,16 +29,29 @@ extern "C" { #include <inaddr.h> #include <in6addr.h> +typedef enum RASAPIVERSION +{ + RASAPIVERSION_500 = 1, + RASAPIVERSION_501, + RASAPIVERSION_600, + RASAPIVERSION_601, +} RASAPIVERSION; + +#define RASAPIVERSION_CURRENT RASAPIVERSION_601 + #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxDeviceName 128 #define RAS_MaxDeviceType 16 #define RAS_MaxEntryName 256 #define RAS_MaxPhoneNumber 128 +#define RAS_MaxIpAddress 15 +#define RAS_MaxIpxAddress 21 #define RAS_MaxAreaCode 10 #define RAS_MaxPadType 32 #define RAS_MaxX25Address 200 #define RAS_MaxFacilities 200 #define RAS_MaxUserData 200 +#define RAS_MaxReplyMessage 1024 #define RAS_MaxDnsSuffix 256 /* szDeviceType strings for RASDEVINFO */ @@ -75,6 +89,31 @@ DECL_WINELIB_TYPE_AW(LPRASDEVINFO) DECLARE_HANDLE(HRASCONN); typedef HRASCONN* LPHRASCONN; +#define RASCF_AllUsers 0x00000001 +#define RASCF_GlobalCreds 0x00000002 +#define RASCF_OwnerKnown 0x00000004 +#define RASCF_OwnerMatch 0x00000008 + +#define RASCF_IsOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown|RASCF_OwnerMatch)) +#define RASCF_IsNotOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown)) + +#define RDEOPT_UsePrefixSuffix 0x00000001 +#define RDEOPT_PausedStates 0x00000002 +#define RDEOPT_IgnoreModemSpeaker 0x00000004 +#define RDEOPT_SetModemSpeaker 0x00000008 +#define RDEOPT_IgnoreSoftwareCompression 0x00000010 +#define RDEOPT_SetSoftwareCompression 0x00000020 +#define RDEOPT_DisableConnectedUI 0x00000040 +#define RDEOPT_DisableReconnectUI 0x00000080 +#define RDEOPT_DisableReconnect 0x00000100 +#define RDEOPT_NoUser 0x00000200 +#define RDEOPT_PauseOnScript 0x00000400 +#define RDEOPT_Router 0x00000800 +#define RDEOPT_CustomDial 0x00001000 +#define RDEOPT_UseCustomScripting 0x00002000 +#define RDEOPT_InvokeAutoTriggerCredentialUI 0x00004000 +#define RDEOPT_EapInfoCryptInCapable 0x00008000 + typedef struct tagRASCONNA { DWORD dwSize; HRASCONN hRasConn; @@ -106,14 +145,20 @@ typedef struct tagRASCONNW { DECL_WINELIB_TYPE_AW(RASCONN) DECL_WINELIB_TYPE_AW(LPRASCONN) +#define REN_User 0x00000000 +#define REN_AllUsers 0x00000001 typedef struct tagRASENTRYNAMEA { DWORD dwSize; CHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + CHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEA, *LPRASENTRYNAMEA; typedef struct tagRASENTRYNAMEW { DWORD dwSize; WCHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + WCHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEW, *LPRASENTRYNAMEW; DECL_WINELIB_TYPE_AW(RASENTRYNAME) @@ -129,6 +174,8 @@ typedef struct tagRASDIALPARAMSA { CHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPSTR szEncPassword; } RASDIALPARAMSA, *LPRASDIALPARAMSA; typedef struct tagRASDIALPARAMSW { @@ -141,31 +188,123 @@ typedef struct tagRASDIALPARAMSW { WCHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPWSTR szEncPassword; } RASDIALPARAMSW, *LPRASDIALPARAMSW; DECL_WINELIB_TYPE_AW(RASDIALPARAMS) DECL_WINELIB_TYPE_AW(LPRASDIALPARAMS) typedef struct tagRASIPADDR { - BYTE classA,classB,classC,classD; + BYTE classA,classB,classC,classD; } RASIPADDR; -#define RASEO_UseCountryAndAreaCodes 0x0001 -#define RASEO_SpecificIpAddr 0x0002 -#define RASEO_SpecificNameServers 0x0004 -#define RASEO_IpHeaderCompression 0x0008 -#define RASEO_RemoteDefaultGateway 0x0010 -#define RASEO_DisableLcpExtensions 0x0020 -#define RASEO_TerminalBeforeDial 0x0040 -#define RASEO_TerminalAfterDial 0x0080 -#define RASEO_ModemLights 0x0100 -#define RASEO_SwCompression 0x0200 -#define RASEO_RequireEncryptedPw 0x0400 -#define RASEO_RequireMsEncryptedPw 0x0800 -#define RASEO_RequireDataEncryption 0x1000 -#define RASEO_NetworkLogon 0x2000 -#define RASEO_UseLogonCredentials 0x4000 -#define RASEO_PromoteAlternates 0x8000 +typedef struct WS(in_addr) RASIPV4ADDR; +typedef struct WS(in6_addr) RASIPV6ADDR; + +#define RASEO_UseCountryAndAreaCodes 0x00000001 +#define RASEO_SpecificIpAddr 0x00000002 +#define RASEO_SpecificNameServers 0x00000004 +#define RASEO_IpHeaderCompression 0x00000008 +#define RASEO_RemoteDefaultGateway 0x00000010 +#define RASEO_DisableLcpExtensions 0x00000020 +#define RASEO_TerminalBeforeDial 0x00000040 +#define RASEO_TerminalAfterDial 0x00000080 +#define RASEO_ModemLights 0x00000100 +#define RASEO_SwCompression 0x00000200 +#define RASEO_RequireEncryptedPw 0x00000400 +#define RASEO_RequireMsEncryptedPw 0x00000800 +#define RASEO_RequireDataEncryption 0x00001000 +#define RASEO_NetworkLogon 0x00002000 +#define RASEO_UseLogonCredentials 0x00004000 +#define RASEO_PromoteAlternates 0x00008000 +#define RASEO_SecureLocalFiles 0x00010000 +#define RASEO_RequireEAP 0x00020000 +#define RASEO_RequirePAP 0x00040000 +#define RASEO_RequireSPAP 0x00080000 +#define RASEO_Custom 0x00100000 +#define RASEO_PreviewPhoneNumber 0x00200000 +#define RASEO_SharedPhoneNumbers 0x00800000 +#define RASEO_PreviewUserPw 0x01000000 +#define RASEO_PreviewDomain 0x02000000 +#define RASEO_ShowDialingProgress 0x04000000 +#define RASEO_RequireCHAP 0x08000000 +#define RASEO_RequireMsCHAP 0x10000000 +#define RASEO_RequireMsCHAP2 0x20000000 +#define RASEO_RequireW95MSCHAP 0x40000000 +#define RASEO_CustomScript 0x80000000 + +#define RASNP_NetBEUI 0x00000001 +#define RASNP_Ipx 0x00000002 +#define RASNP_Ip 0x00000004 +#define RASNP_Ipv6 0x00000008 + +#define RASFP_Ppp 0x00000001 +#define RASFP_Slip 0x00000002 +#define RASFP_Ras 0x00000004 + +#define RASEDM_DialAll 1 +#define RASEDM_DialAsNeeded 2 + +#define RASIDS_Disabled 0xffffffff +#define RASIDS_UseGlobalValue 0 + +#define RASET_Phone 1 +#define RASET_Vpn 2 +#define RASET_Direct 3 +#define RASET_Internet 4 +#define RASET_Broadband 5 + +#define ET_None 0 +#define ET_Require 1 +#define ET_RequireMax 2 +#define ET_Optional 3 + +#define VS_Default 0 +#define VS_PptpOnly 1 +#define VS_PptpFirst 2 +#define VS_L2tpOnly 3 +#define VS_L2tpFirst 4 +#define VS_SstpOnly 5 +#define VS_SstpFirst 6 +#define VS_Ikev2Only 7 +#define VS_Ikev2First 8 +#define VS_GREOnly 9 +#define VS_PptpSstp 12 +#define VS_L2tpSstp 13 +#define VS_Ikev2Sstp 14 + +#define RASEO2_SecureFileAndPrint 0x00000001 +#define RASEO2_SecureClientForMSNet 0x00000002 +#define RASEO2_DontNegotiateMultilink 0x00000004 +#define RASEO2_DontUseRasCredentials 0x00000008 +#define RASEO2_UsePreSharedKey 0x00000010 +#define RASEO2_Internet 0x00000020 +#define RASEO2_DisableNbtOverIP 0x00000040 +#define RASEO2_UseGlobalDeviceSettings 0x00000080 +#define RASEO2_ReconnectIfDropped 0x00000100 +#define RASEO2_SharePhoneNumbers 0x00000200 +#define RASEO2_SecureRoutingCompartment 0x00000400 +#define RASEO2_UseTypicalSettings 0x00000800 +#define RASEO2_IPv6SpecificNameServers 0x00001000 +#define RASEO2_IPv6RemoteDefaultGateway 0x00002000 +#define RASEO2_RegisterIpWithDNS 0x00004000 +#define RASEO2_UseDNSSuffixForRegistration 0x00008000 +#define RASEO2_IPv4ExplicitMetric 0x00010000 +#define RASEO2_IPv6ExplicitMetric 0x00020000 +#define RASEO2_DisableIKENameEkuCheck 0x00040000 +#define RASEO2_DisableClassBasedStaticRoute 0x00080000 +#define RASEO2_SpecificIPv6Addr 0x00100000 +#define RASEO2_DisableMobility 0x00200000 +#define RASEO2_RequireMachineCertificates 0x00400000 +#define RASEO2_UsePreSharedKeyForIkev2Initiator 0x00800000 +#define RASEO2_UsePreSharedKeyForIkev2Responder 0x01000000 +#define RASEO2_CacheCredentials 0x02000000 +#define RASEO2_AutoTriggerCapable 0x04000000 +#define RASEO2_IsThirdPartyProfile 0x08000000 +#define RASEO2_AuthTypeIsOtp 0x10000000 +#define RASEO2_IsAlwaysOn 0x20000000 +#define RASEO2_IsPrivateNetwork 0x40000000 typedef struct tagRASENTRYA { DWORD dwSize; DWORD dwfOptions; @@ -238,6 +377,15 @@ typedef struct tagRASENTRYA { CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYA, *LPRASENTRYA; typedef struct tagRASENTRYW { @@ -312,45 +460,84 @@ typedef struct tagRASENTRYW { WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYW, *LPRASENTRYW; DECL_WINELIB_TYPE_AW(RASENTRY) +#define RASTUNNELENDPOINT_UNKNOWN 0 +#define RASTUNNELENDPOINT_IPv4 1 +#define RASTUNNELENDPOINT_IPv6 2 +typedef struct tagRASTUNNELENDPOINT +{ + DWORD dwType; + union { + RASIPV4ADDR ipv4; + RASIPV6ADDR ipv6; + } DUMMYUNIONNAME; +} RASTUNNELENDPOINT; + #define RASCS_PAUSED 0x1000 #define RASCS_DONE 0x2000 typedef enum tagRASCONNSTATE { - RASCS_OpenPort = 0, - RASCS_PortOpened, - RASCS_ConnectDevice, - RASCS_DeviceConnected, - RASCS_AllDevicesConnected, - RASCS_Authenticate, - RASCS_AuthNotify, - RASCS_AuthRetry, - RASCS_AuthCallback, - RASCS_AuthChangePassword, - RASCS_AuthProject, - RASCS_AuthLinkSpeed, - RASCS_AuthAck, - RASCS_ReAuthenticate, - RASCS_Authenticated, - RASCS_PrepareForCallback, - RASCS_WaitForModemReset, - RASCS_WaitForCallback, - RASCS_Projected, - RASCS_StartAuthentication, - RASCS_CallbackComplete, - RASCS_LogonNetwork, - RASCS_SubEntryConnected, - RASCS_SubEntryDisconnected, - RASCS_Interactive = RASCS_PAUSED, - RASCS_RetryAuthentication, - RASCS_CallbackSetByCaller, - RASCS_PasswordExpired, - RASCS_Connected = RASCS_DONE, - RASCS_Disconnected -} RASCONNSTATE, *LPRASCONNSTATE; + RASCS_OpenPort = 0, + RASCS_PortOpened, + RASCS_ConnectDevice, + RASCS_DeviceConnected, + RASCS_AllDevicesConnected, + RASCS_Authenticate, + RASCS_AuthNotify, + RASCS_AuthRetry, + RASCS_AuthCallback, + RASCS_AuthChangePassword, + RASCS_AuthProject, + RASCS_AuthLinkSpeed, + RASCS_AuthAck, + RASCS_ReAuthenticate, + RASCS_Authenticated, + RASCS_PrepareForCallback, + RASCS_WaitForModemReset, + RASCS_WaitForCallback, + RASCS_Projected, + RASCS_StartAuthentication, + RASCS_CallbackComplete, + RASCS_LogonNetwork, + RASCS_SubEntryConnected, + RASCS_SubEntryDisconnected, + RASCS_ApplySettings, + RASCS_Interactive = RASCS_PAUSED, + RASCS_RetryAuthentication, + RASCS_CallbackSetByCaller, + RASCS_PasswordExpired, + RASCS_InvokeEapUI, + RASCS_Connected = RASCS_DONE, + RASCS_Disconnected +} RASCONNSTATE, *LPRASCONNSTATE; + +#define RASDIALEVENT "RasDialEvent" +#define WM_RASDIALEVENT 0xCCCD + +typedef VOID (WINAPI *RASDIALFUNC)(UINT, RASCONNSTATE, DWORD); +typedef VOID (WINAPI *RASDIALFUNC1)(HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); +typedef DWORD (WINAPI *RASDIALFUNC2)(ULONG_PTR, DWORD, HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); + +#define RASCSS_DONE 0x2000 +typedef enum tagRASCONNSUBSTATE +{ + RASCSS_None = 0, + RASCSS_Dormant, + RASCSS_Reconnecting, + RASCSS_Reconnected = RASCSS_DONE, +} RASCONNSUBSTATE, *LPRASCONNSUBSTATE; typedef struct tagRASCONNSTATUSA { @@ -359,6 +546,10 @@ typedef struct tagRASCONNSTATUSA DWORD dwError; CHAR szDeviceType[RAS_MaxDeviceType + 1]; CHAR szDeviceName[RAS_MaxDeviceName + 1]; + CHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSA, *LPRASCONNSTATUSA; typedef struct tagRASCONNSTATUSW @@ -368,6 +559,10 @@ typedef struct tagRASCONNSTATUSW DWORD dwError; WCHAR szDeviceType[RAS_MaxDeviceType + 1]; WCHAR szDeviceName[RAS_MaxDeviceName + 1]; + WCHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSW, *LPRASCONNSTATUSW; DECL_WINELIB_TYPE_AW(RASCONNSTATUS) @@ -378,7 +573,9 @@ typedef enum tagRASPROJECTION RASP_PppNbf = 0x803F, RASP_PppIpx = 0x802B, RASP_PppIp = 0x8021, + RASP_PppCcp = 0x80FD, RASP_PppLcp = 0xC021, + RASP_PppIpv6 = 0x8057, RASP_Slip = 0x20000 } RASPROJECTION, *LPRASPROJECTION; @@ -402,12 +599,28 @@ typedef struct tagRASSUBENTRYW DWORD dwAlternateOffset; } RASSUBENTRYW, *LPRASSUBENTRYW; +typedef struct tagRASEAPINFO +{ + DWORD dwSizeofEapInfo; + BYTE *pbEapInfo; +} RASEAPINFO; + +typedef struct tagRASDEVSPECIFICINFO +{ + DWORD dwSize; + BYTE *pbDevSpecificInfo; +} RASDEVSPECIFICINFO, *PRASDEVSPECIFICINFO; + typedef struct tagRASDIALEXTENSIONS { DWORD dwSize; DWORD dwfOptions; HWND hwndParent; ULONG_PTR reserved; + ULONG_PTR reserved1; + RASEAPINFO RasEapInfo; + BOOL fSkipPppAuth; + RASDEVSPECIFICINFO RasDevSpecificInfo; } RASDIALEXTENSIONS, *LPRASDIALEXTENSIONS; typedef struct tagRASAUTODIALENTRYA @@ -426,6 +639,32 @@ typedef struct tagRASAUTODIALENTRYW WCHAR szEntry[ RAS_MaxEntryName + 1 ]; } RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW; +#define RASADFLG_PositionDlg 0x00000001 +typedef struct tagRASADPARAMS +{ + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; +} RASADPARAMS, *LPRASADPARAMS; + +typedef BOOL (WINAPI *RASADFUNCA)(LPSTR, LPSTR, LPRASADPARAMS, LPDWORD); +typedef BOOL (WINAPI *RASADFUNCW)(LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD); + +#define RASADP_DisableConnectionQuery 0 +#define RASADP_LoginSessionDisable 1 +#define RASADP_SavedAddressesLimit 2 +#define RASADP_FailedConnectionTimeout 3 +#define RASADP_ConnectionQueryTimeout 4 + +#define RASCN_Connection 0x00000001 +#define RASCN_Disconnection 0x00000002 +#define RASCN_BandwidthAdded 0x00000004 +#define RASCN_BandwidthRemoved 0x00000008 +#define RASCN_Dormant 0x00000010 +#define RASCN_ReConnection 0x00000020 + typedef struct _RAS_STATS { DWORD dwSize; -- 2.21.0

2 1

[PATCH] user32/test: Start the AdjustWindowRectExForDpi() from a known state.
by Francois Gouget 22 Nov '19

22 Nov '19

rect and rect2 have been modified by the previous test by the time we get to AdjustWindowRectExForDpi(). This makes interpreting the traces harder in case of a failure. So reset them to the same starting state as for the AdjustWindowRectEx() test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- This does not fix the Windows 10 1709+ failures :-( dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 78dc55f00a8..b9309a8cba6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5407,6 +5407,8 @@ static void test_AWR_flags(void) style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 )); if (pAdjustWindowRectExForDpi) { + SetRect( &rect, 100, 100, 200, 200 ); + rect2 = rect; pAdjustWindowRectExForDpi( &rect, style, FALSE, exstyle, 192 ); wine_AdjustWindowRectExForDpi( &rect2, style, FALSE, exstyle, 192 ); ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n", -- 2.20.1

2 2

[PATCH] urlmon/tests: Expect BINDSTRING_SAMESITE_COOKIE_LEVEL on newer IE11.
by Jacek Caban 22 Nov '19

22 Nov '19

From: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 13 +++++++++++-- include/urlmon.idl | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-)

2 1

[PATCH] urlmon/tests: Fix CoInternetCombineIUri tests on Windows 10 1607 to 1709.
by Jacek Caban 22 Nov '19

22 Nov '19

From: Francois Gouget <fgouget(a)free.fr> It does not check the relative path and thus will accept non-sensical % codes. This is fixed in Windows 10 1809. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] urlmon/tests: Don't perform extra uri tests if a failure was expected.
by Francois Gouget 22 Nov '19

22 Nov '19

When a failure is expected uri_combine_tests[] has no extra test data. So don't attempt to perform extra tests even if CoInternetCombineIUri() unexpectedly succeeds. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9069a9c1763..9d6af349dcc 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10587,7 +10587,7 @@ static void test_CoInternetCombineIUri(void) { ok(hr == uri_combine_tests[i].expected, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr) && uri_combine_tests[i].expected) { DWORD j; for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) { -- 2.20.1

2 1

[PATCH] vbscript: Add script TypeInfo stub.
by Jacek Caban 22 Nov '19

22 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 268 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 264 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] jscript: Trace the pstrItemName parameter.
by Gabriel Ivăncescu 22 Nov '19

22 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 60711fc..219d923 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -606,7 +606,7 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR { JScript *This = impl_from_IActiveScript(iface); - TRACE("(%p)->(%p)\n", This, ppdisp); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(pstrItemName), ppdisp); if(!ppdisp) return E_POINTER; -- 2.21.0

2 3

[PATCH] jscript: Fix a copy-paste mistake.
by Gabriel Ivăncescu 22 Nov '19

22 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 60711fc..67138da 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -130,7 +130,7 @@ static void clear_script_queue(JScript *This) static void clear_persistent_code_list(JScript *This) { - while(!list_empty(&This->queued_code)) + while(!list_empty(&This->persistent_code)) { bytecode_t *iter = LIST_ENTRY(list_head(&This->persistent_code), bytecode_t, entry); list_remove(&iter->entry); -- 2.21.0

2 1

[PATCH v2] include: update definitions in ras.h
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/ras.h | 336 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 288 insertions(+), 48 deletions(-) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6db..970884164385 100644 --- a/include/ras.h +++ b/include/ras.h @@ -1,5 +1,6 @@ /* * Copyright (C) 1998 Marcus Meissner + * Copyright (C) 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,16 +29,29 @@ extern "C" { #include <inaddr.h> #include <in6addr.h> +typedef enum RASAPIVERSION +{ + RASAPIVERSION_500 = 1, + RASAPIVERSION_501, + RASAPIVERSION_600, + RASAPIVERSION_601, +} RASAPIVERSION; + +#define RASAPIVERSION_CURRENT RASAPIVERSION_601 + #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxDeviceName 128 #define RAS_MaxDeviceType 16 #define RAS_MaxEntryName 256 #define RAS_MaxPhoneNumber 128 +#define RAS_MaxIpAddress 15 +#define RAS_MaxIpxAddress 21 #define RAS_MaxAreaCode 10 #define RAS_MaxPadType 32 #define RAS_MaxX25Address 200 #define RAS_MaxFacilities 200 #define RAS_MaxUserData 200 +#define RAS_MaxReplyMessage 1024 #define RAS_MaxDnsSuffix 256 /* szDeviceType strings for RASDEVINFO */ @@ -75,6 +89,31 @@ DECL_WINELIB_TYPE_AW(LPRASDEVINFO) DECLARE_HANDLE(HRASCONN); typedef HRASCONN* LPHRASCONN; +#define RASCF_AllUsers 0x00000001 +#define RASCF_GlobalCreds 0x00000002 +#define RASCF_OwnerKnown 0x00000004 +#define RASCF_OwnerMatch 0x00000008 + +#define RASCF_IsOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown|RASCF_OwnerMatch)) +#define RASCF_IsNotOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown)) + +#define RDEOPT_UsePrefixSuffix 0x00000001 +#define RDEOPT_PausedStates 0x00000002 +#define RDEOPT_IgnoreModemSpeaker 0x00000004 +#define RDEOPT_SetModemSpeaker 0x00000008 +#define RDEOPT_IgnoreSoftwareCompression 0x00000010 +#define RDEOPT_SetSoftwareCompression 0x00000020 +#define RDEOPT_DisableConnectedUI 0x00000040 +#define RDEOPT_DisableReconnectUI 0x00000080 +#define RDEOPT_DisableReconnect 0x00000100 +#define RDEOPT_NoUser 0x00000200 +#define RDEOPT_PauseOnScript 0x00000400 +#define RDEOPT_Router 0x00000800 +#define RDEOPT_CustomDial 0x00001000 +#define RDEOPT_UseCustomScripting 0x00002000 +#define RDEOPT_InvokeAutoTriggerCredentialUI 0x00004000 +#define RDEOPT_EapInfoCryptInCapable 0x00008000 + typedef struct tagRASCONNA { DWORD dwSize; HRASCONN hRasConn; @@ -106,14 +145,20 @@ typedef struct tagRASCONNW { DECL_WINELIB_TYPE_AW(RASCONN) DECL_WINELIB_TYPE_AW(LPRASCONN) +#define REN_User 0x00000000 +#define REN_AllUsers 0x00000001 typedef struct tagRASENTRYNAMEA { DWORD dwSize; CHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + CHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEA, *LPRASENTRYNAMEA; typedef struct tagRASENTRYNAMEW { DWORD dwSize; WCHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + WCHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEW, *LPRASENTRYNAMEW; DECL_WINELIB_TYPE_AW(RASENTRYNAME) @@ -129,6 +174,8 @@ typedef struct tagRASDIALPARAMSA { CHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPSTR szEncPassword; } RASDIALPARAMSA, *LPRASDIALPARAMSA; typedef struct tagRASDIALPARAMSW { @@ -141,31 +188,124 @@ typedef struct tagRASDIALPARAMSW { WCHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPWSTR szEncPassword; } RASDIALPARAMSW, *LPRASDIALPARAMSW; DECL_WINELIB_TYPE_AW(RASDIALPARAMS) DECL_WINELIB_TYPE_AW(LPRASDIALPARAMS) typedef struct tagRASIPADDR { - BYTE classA,classB,classC,classD; + BYTE classA,classB,classC,classD; } RASIPADDR; -#define RASEO_UseCountryAndAreaCodes 0x0001 -#define RASEO_SpecificIpAddr 0x0002 -#define RASEO_SpecificNameServers 0x0004 -#define RASEO_IpHeaderCompression 0x0008 -#define RASEO_RemoteDefaultGateway 0x0010 -#define RASEO_DisableLcpExtensions 0x0020 -#define RASEO_TerminalBeforeDial 0x0040 -#define RASEO_TerminalAfterDial 0x0080 -#define RASEO_ModemLights 0x0100 -#define RASEO_SwCompression 0x0200 -#define RASEO_RequireEncryptedPw 0x0400 -#define RASEO_RequireMsEncryptedPw 0x0800 -#define RASEO_RequireDataEncryption 0x1000 -#define RASEO_NetworkLogon 0x2000 -#define RASEO_UseLogonCredentials 0x4000 -#define RASEO_PromoteAlternates 0x8000 +typedef struct in_addr RASIPV4ADDR; + +typedef struct in6_addr RASIPV6ADDR; + +#define RASEO_UseCountryAndAreaCodes 0x00000001 +#define RASEO_SpecificIpAddr 0x00000002 +#define RASEO_SpecificNameServers 0x00000004 +#define RASEO_IpHeaderCompression 0x00000008 +#define RASEO_RemoteDefaultGateway 0x00000010 +#define RASEO_DisableLcpExtensions 0x00000020 +#define RASEO_TerminalBeforeDial 0x00000040 +#define RASEO_TerminalAfterDial 0x00000080 +#define RASEO_ModemLights 0x00000100 +#define RASEO_SwCompression 0x00000200 +#define RASEO_RequireEncryptedPw 0x00000400 +#define RASEO_RequireMsEncryptedPw 0x00000800 +#define RASEO_RequireDataEncryption 0x00001000 +#define RASEO_NetworkLogon 0x00002000 +#define RASEO_UseLogonCredentials 0x00004000 +#define RASEO_PromoteAlternates 0x00008000 +#define RASEO_SecureLocalFiles 0x00010000 +#define RASEO_RequireEAP 0x00020000 +#define RASEO_RequirePAP 0x00040000 +#define RASEO_RequireSPAP 0x00080000 +#define RASEO_Custom 0x00100000 +#define RASEO_PreviewPhoneNumber 0x00200000 +#define RASEO_SharedPhoneNumbers 0x00800000 +#define RASEO_PreviewUserPw 0x01000000 +#define RASEO_PreviewDomain 0x02000000 +#define RASEO_ShowDialingProgress 0x04000000 +#define RASEO_RequireCHAP 0x08000000 +#define RASEO_RequireMsCHAP 0x10000000 +#define RASEO_RequireMsCHAP2 0x20000000 +#define RASEO_RequireW95MSCHAP 0x40000000 +#define RASEO_CustomScript 0x80000000 + +#define RASNP_NetBEUI 0x00000001 +#define RASNP_Ipx 0x00000002 +#define RASNP_Ip 0x00000004 +#define RASNP_Ipv6 0x00000008 + +#define RASFP_Ppp 0x00000001 +#define RASFP_Slip 0x00000002 +#define RASFP_Ras 0x00000004 + +#define RASEDM_DialAll 1 +#define RASEDM_DialAsNeeded 2 + +#define RASIDS_Disabled 0xffffffff +#define RASIDS_UseGlobalValue 0 + +#define RASET_Phone 1 +#define RASET_Vpn 2 +#define RASET_Direct 3 +#define RASET_Internet 4 +#define RASET_Broadband 5 + +#define ET_None 0 +#define ET_Require 1 +#define ET_RequireMax 2 +#define ET_Optional 3 + +#define VS_Default 0 +#define VS_PptpOnly 1 +#define VS_PptpFirst 2 +#define VS_L2tpOnly 3 +#define VS_L2tpFirst 4 +#define VS_SstpOnly 5 +#define VS_SstpFirst 6 +#define VS_Ikev2Only 7 +#define VS_Ikev2First 8 +#define VS_GREOnly 9 +#define VS_PptpSstp 12 +#define VS_L2tpSstp 13 +#define VS_Ikev2Sstp 14 + +#define RASEO2_SecureFileAndPrint 0x00000001 +#define RASEO2_SecureClientForMSNet 0x00000002 +#define RASEO2_DontNegotiateMultilink 0x00000004 +#define RASEO2_DontUseRasCredentials 0x00000008 +#define RASEO2_UsePreSharedKey 0x00000010 +#define RASEO2_Internet 0x00000020 +#define RASEO2_DisableNbtOverIP 0x00000040 +#define RASEO2_UseGlobalDeviceSettings 0x00000080 +#define RASEO2_ReconnectIfDropped 0x00000100 +#define RASEO2_SharePhoneNumbers 0x00000200 +#define RASEO2_SecureRoutingCompartment 0x00000400 +#define RASEO2_UseTypicalSettings 0x00000800 +#define RASEO2_IPv6SpecificNameServers 0x00001000 +#define RASEO2_IPv6RemoteDefaultGateway 0x00002000 +#define RASEO2_RegisterIpWithDNS 0x00004000 +#define RASEO2_UseDNSSuffixForRegistration 0x00008000 +#define RASEO2_IPv4ExplicitMetric 0x00010000 +#define RASEO2_IPv6ExplicitMetric 0x00020000 +#define RASEO2_DisableIKENameEkuCheck 0x00040000 +#define RASEO2_DisableClassBasedStaticRoute 0x00080000 +#define RASEO2_SpecificIPv6Addr 0x00100000 +#define RASEO2_DisableMobility 0x00200000 +#define RASEO2_RequireMachineCertificates 0x00400000 +#define RASEO2_UsePreSharedKeyForIkev2Initiator 0x00800000 +#define RASEO2_UsePreSharedKeyForIkev2Responder 0x01000000 +#define RASEO2_CacheCredentials 0x02000000 +#define RASEO2_AutoTriggerCapable 0x04000000 +#define RASEO2_IsThirdPartyProfile 0x08000000 +#define RASEO2_AuthTypeIsOtp 0x10000000 +#define RASEO2_IsAlwaysOn 0x20000000 +#define RASEO2_IsPrivateNetwork 0x40000000 typedef struct tagRASENTRYA { DWORD dwSize; DWORD dwfOptions; @@ -238,6 +378,15 @@ typedef struct tagRASENTRYA { CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYA, *LPRASENTRYA; typedef struct tagRASENTRYW { @@ -312,45 +461,84 @@ typedef struct tagRASENTRYW { WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYW, *LPRASENTRYW; DECL_WINELIB_TYPE_AW(RASENTRY) +#define RASTUNNELENDPOINT_UNKNOWN 0 +#define RASTUNNELENDPOINT_IPv4 1 +#define RASTUNNELENDPOINT_IPv6 2 +typedef struct tagRASTUNNELENDPOINT +{ + DWORD dwType; + union { + RASIPV4ADDR ipv4; + RASIPV6ADDR ipv6; + } DUMMYUNIONNAME; +} RASTUNNELENDPOINT; + #define RASCS_PAUSED 0x1000 #define RASCS_DONE 0x2000 typedef enum tagRASCONNSTATE { - RASCS_OpenPort = 0, - RASCS_PortOpened, - RASCS_ConnectDevice, - RASCS_DeviceConnected, - RASCS_AllDevicesConnected, - RASCS_Authenticate, - RASCS_AuthNotify, - RASCS_AuthRetry, - RASCS_AuthCallback, - RASCS_AuthChangePassword, - RASCS_AuthProject, - RASCS_AuthLinkSpeed, - RASCS_AuthAck, - RASCS_ReAuthenticate, - RASCS_Authenticated, - RASCS_PrepareForCallback, - RASCS_WaitForModemReset, - RASCS_WaitForCallback, - RASCS_Projected, - RASCS_StartAuthentication, - RASCS_CallbackComplete, - RASCS_LogonNetwork, - RASCS_SubEntryConnected, - RASCS_SubEntryDisconnected, - RASCS_Interactive = RASCS_PAUSED, - RASCS_RetryAuthentication, - RASCS_CallbackSetByCaller, - RASCS_PasswordExpired, - RASCS_Connected = RASCS_DONE, - RASCS_Disconnected -} RASCONNSTATE, *LPRASCONNSTATE; + RASCS_OpenPort = 0, + RASCS_PortOpened, + RASCS_ConnectDevice, + RASCS_DeviceConnected, + RASCS_AllDevicesConnected, + RASCS_Authenticate, + RASCS_AuthNotify, + RASCS_AuthRetry, + RASCS_AuthCallback, + RASCS_AuthChangePassword, + RASCS_AuthProject, + RASCS_AuthLinkSpeed, + RASCS_AuthAck, + RASCS_ReAuthenticate, + RASCS_Authenticated, + RASCS_PrepareForCallback, + RASCS_WaitForModemReset, + RASCS_WaitForCallback, + RASCS_Projected, + RASCS_StartAuthentication, + RASCS_CallbackComplete, + RASCS_LogonNetwork, + RASCS_SubEntryConnected, + RASCS_SubEntryDisconnected, + RASCS_ApplySettings, + RASCS_Interactive = RASCS_PAUSED, + RASCS_RetryAuthentication, + RASCS_CallbackSetByCaller, + RASCS_PasswordExpired, + RASCS_InvokeEapUI, + RASCS_Connected = RASCS_DONE, + RASCS_Disconnected +} RASCONNSTATE, *LPRASCONNSTATE; + +#define RASDIALEVENT "RasDialEvent" +#define WM_RASDIALEVENT 0xCCCD + +typedef VOID (WINAPI *RASDIALFUNC)(UINT, RASCONNSTATE, DWORD); +typedef VOID (WINAPI *RASDIALFUNC1)(HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); +typedef DWORD (WINAPI *RASDIALFUNC2)(ULONG_PTR, DWORD, HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); + +#define RASCSS_DONE 0x2000 +typedef enum tagRASCONNSUBSTATE +{ + RASCSS_None = 0, + RASCSS_Dormant, + RASCSS_Reconnecting, + RASCSS_Reconnected = RASCSS_DONE, +} RASCONNSUBSTATE, *LPRASCONNSUBSTATE; typedef struct tagRASCONNSTATUSA { @@ -359,6 +547,10 @@ typedef struct tagRASCONNSTATUSA DWORD dwError; CHAR szDeviceType[RAS_MaxDeviceType + 1]; CHAR szDeviceName[RAS_MaxDeviceName + 1]; + CHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSA, *LPRASCONNSTATUSA; typedef struct tagRASCONNSTATUSW @@ -368,6 +560,10 @@ typedef struct tagRASCONNSTATUSW DWORD dwError; WCHAR szDeviceType[RAS_MaxDeviceType + 1]; WCHAR szDeviceName[RAS_MaxDeviceName + 1]; + WCHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSW, *LPRASCONNSTATUSW; DECL_WINELIB_TYPE_AW(RASCONNSTATUS) @@ -378,7 +574,9 @@ typedef enum tagRASPROJECTION RASP_PppNbf = 0x803F, RASP_PppIpx = 0x802B, RASP_PppIp = 0x8021, + RASP_PppCcp = 0x80FD, RASP_PppLcp = 0xC021, + RASP_PppIpv6 = 0x8057, RASP_Slip = 0x20000 } RASPROJECTION, *LPRASPROJECTION; @@ -402,12 +600,28 @@ typedef struct tagRASSUBENTRYW DWORD dwAlternateOffset; } RASSUBENTRYW, *LPRASSUBENTRYW; +typedef struct tagRASEAPINFO +{ + DWORD dwSizeofEapInfo; + BYTE *pbEapInfo; +} RASEAPINFO; + +typedef struct tagRASDEVSPECIFICINFO +{ + DWORD dwSize; + BYTE *pbDevSpecificInfo; +} RASDEVSPECIFICINFO, *PRASDEVSPECIFICINFO; + typedef struct tagRASDIALEXTENSIONS { DWORD dwSize; DWORD dwfOptions; HWND hwndParent; ULONG_PTR reserved; + ULONG_PTR reserved1; + RASEAPINFO RasEapInfo; + BOOL fSkipPppAuth; + RASDEVSPECIFICINFO RasDevSpecificInfo; } RASDIALEXTENSIONS, *LPRASDIALEXTENSIONS; typedef struct tagRASAUTODIALENTRYA @@ -426,6 +640,32 @@ typedef struct tagRASAUTODIALENTRYW WCHAR szEntry[ RAS_MaxEntryName + 1 ]; } RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW; +#define RASADFLG_PositionDlg 0x00000001 +typedef struct tagRASADPARAMS +{ + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; +} RASADPARAMS, *LPRASADPARAMS; + +typedef BOOL (WINAPI *RASADFUNCA)(LPSTR, LPSTR, LPRASADPARAMS, LPDWORD); +typedef BOOL (WINAPI *RASADFUNCW)(LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD); + +#define RASADP_DisableConnectionQuery 0 +#define RASADP_LoginSessionDisable 1 +#define RASADP_SavedAddressesLimit 2 +#define RASADP_FailedConnectionTimeout 3 +#define RASADP_ConnectionQueryTimeout 4 + +#define RASCN_Connection 0x00000001 +#define RASCN_Disconnection 0x00000002 +#define RASCN_BandwidthAdded 0x00000004 +#define RASCN_BandwidthRemoved 0x00000008 +#define RASCN_Dormant 0x00000010 +#define RASCN_ReConnection 0x00000020 + typedef struct _RAS_STATS { DWORD dwSize; -- 2.21.0

2 1

[PATCH] gdi32/tests: Reserve sufficient room for DIB data.
by Jeff Smith 22 Nov '19

22 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48054 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 41 ++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8fe160546c..dea7c3d9db 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -910,10 +910,15 @@ static void test_dibsections(void) ReleaseDC(0, hdc); } +#define DATA_WIDTH 2 +#define DATA_HEIGHT 2 +#define MAX_PLANES 64 +#define MAX_BPP 64 + static void test_dib_formats(void) { BITMAPINFO *bi; - char data[256]; + char data[((DATA_WIDTH * MAX_BPP + 31) / 32) * 4 * DATA_HEIGHT * MAX_PLANES]; void *bits; int planes, bpp, compr, format; HBITMAP hdib, hbmp; @@ -928,9 +933,9 @@ static void test_dib_formats(void) memset( data, 0xaa, sizeof(data) ); - for (bpp = 0; bpp <= 64; bpp++) + for (bpp = 0; bpp <= MAX_BPP; bpp++) { - for (planes = 0; planes <= 64; planes++) + for (planes = 0; planes <= MAX_PLANES; planes++) { for (compr = 0; compr < 8; compr++) { @@ -949,8 +954,8 @@ static void test_dib_formats(void) memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -969,8 +974,8 @@ static void test_dib_formats(void) if (!planes) expect_ok = FALSE; memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -1027,8 +1032,8 @@ static void test_dib_formats(void) bpp, bi->bmiHeader.biBitCount ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -1067,8 +1072,8 @@ static void test_dib_formats(void) memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = 1; bi->bmiHeader.biBitCount = 16; bi->bmiHeader.biCompression = BI_BITFIELDS; @@ -1121,7 +1126,7 @@ static void test_dib_formats(void) ok( ret, "SetDIBits failed with bad bitfields\n" ); bi->bmiHeader.biWidth = -2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); @@ -1144,7 +1149,7 @@ static void test_dib_formats(void) ok( !ret || broken(ret), /* nt4 */ "GetDIBits succeeded with negative width\n" ); bi->bmiHeader.biWidth = 0; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); @@ -1167,7 +1172,7 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 2, NULL, bi, DIB_RGB_COLORS); ok( !ret || broken(ret), /* nt4 */ "GetDIBits succeeded with zero width\n" ); - bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; bi->bmiHeader.biHeight = 0; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; @@ -1193,8 +1198,8 @@ static void test_dib_formats(void) /* some functions accept DIB_PAL_COLORS+1, but not beyond */ - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 1; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+1, &bits, NULL, 0); @@ -1217,8 +1222,8 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS+1); ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+1\n" ); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 1; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+2, &bits, NULL, 0); -- 2.23.0

3 2

← Newer
1
...
18
19
20
21
22
23
24
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2019