November 2019 - Wine-devel - list.winehq.org

[PATCH] kernel32/tests: Fix the lcid and expected value in a codepage ok() call.
by Francois Gouget 21 Nov '19

21 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/codepage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8b6584415cc..8fcc575a29e 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1126,7 +1126,7 @@ static void test_threadcp(void) cp = 0xdeadbeef; GetLocaleInfoA(lcids[i].lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (LPSTR)&cp, sizeof(cp)); - ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].threadcp, cp); + ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].lcid, lcids[i].threadcp); /* GetCPInfoEx/GetCPInfo - CP_ACP */ SetLastError(0xdeadbeef); -- 2.20.1

1 0

[PATCH] ntdll: s/4Gb/4GB/ in a comment since it refers to bytes.
by Francois Gouget 21 Nov '19

21 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e8ac1ffa7a8..d7232b47d66 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -882,7 +882,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, if (!address) { if (!commitSize) commitSize = COMMIT_MASK + 1; - totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4Gb */ + totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4GB */ if (totalSize < commitSize) totalSize = commitSize; if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK ); -- 2.20.1

1 0

[PATCH 1/5] msvcrt: Add _Strftime tests for seconds.
by Jeff Smith 21 Nov '19

21 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msvcrt/tests/time.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 5df8951c15..e53083c561 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -678,6 +678,9 @@ static void test_strftime(void) { "%X", "0", 0, 0, "m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "00", 0, 0, "mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "m00", 0, 0, "mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "0", 0, 0, "s", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "00", 0, 0, "ss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "s00", 0, 0, "sss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "t", 0, 0, "t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "tam", 0, 0, "tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "tam", 0, 0, "ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, -- 2.23.0

2 9

[PATCH] include: update error codes in raserror.h
by Vijay Kiran Kamuju 21 Nov '19

21 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/raserror.h | 272 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+) diff --git a/include/raserror.h b/include/raserror.h index 549b42423cf9..3462f012cf6c 100644 --- a/include/raserror.h +++ b/include/raserror.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Stefan Leichter + * 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 @@ -20,11 +21,282 @@ #define __WINE_RASERROR_H #define RASBASE 600 +#define PENDING (RASBASE+0) +#define ERROR_INVALID_PORT_HANDLE (RASBASE+1) +#define ERROR_PORT_ALREADY_OPEN (RASBASE+2) #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) +#define ERROR_WRONG_INFO_SPECIFIED (RASBASE+4) +#define ERROR_CANNOT_SET_PORT_INFO (RASBASE+5) +#define ERROR_PORT_NOT_CONNECTED (RASBASE+6) +#define ERROR_EVENT_INVALID (RASBASE+7) +#define ERROR_DEVICE_DOES_NOT_EXIST (RASBASE+8) +#define ERROR_DEVICETYPE_DOES_NOT_EXIST (RASBASE+9) #define ERROR_BUFFER_INVALID (RASBASE+10) +#define ERROR_ROUTE_NOT_AVAILABLE (RASBASE+11) +#define ERROR_ROUTE_NOT_ALLOCATED (RASBASE+12) +#define ERROR_INVALID_COMPRESSION_SPECIFIED (RASBASE+13) +#define ERROR_OUT_OF_BUFFERS (RASBASE+14) +#define ERROR_PORT_NOT_FOUND (RASBASE+15) +#define ERROR_ASYNC_REQUEST_PENDING (RASBASE+16) +#define ERROR_ALREADY_DISCONNECTING (RASBASE+17) +#define ERROR_PORT_NOT_OPEN (RASBASE+18) +#define ERROR_PORT_DISCONNECTED (RASBASE+19) +#define ERROR_NO_ENDPOINTS (RASBASE+20) +#define ERROR_CANNOT_OPEN_PHONEBOOK (RASBASE+21) +#define ERROR_CANNOT_LOAD_PHONEBOOK (RASBASE+22) +#define ERROR_CANNOT_FIND_PHONEBOOK_ENTRY (RASBASE+23) +#define ERROR_CANNOT_WRITE_PHONEBOOK (RASBASE+24) +#define ERROR_CORRUPT_PHONEBOOK (RASBASE+25) +#define ERROR_CANNOT_LOAD_STRING (RASBASE+26) +#define ERROR_KEY_NOT_FOUND (RASBASE+27) +#define ERROR_DISCONNECTION (RASBASE+28) +#define ERROR_REMOTE_DISCONNECTION (RASBASE+29) +#define ERROR_HARDWARE_FAILURE (RASBASE+30) +#define ERROR_USER_DISCONNECTION (RASBASE+31) #define ERROR_INVALID_SIZE (RASBASE+32) +#define ERROR_PORT_NOT_AVAILABLE (RASBASE+33) +#define ERROR_CANNOT_PROJECT_CLIENT (RASBASE+34) #define ERROR_UNKNOWN (RASBASE+35) +#define ERROR_WRONG_DEVICE_ATTACHED (RASBASE+36) +#define ERROR_BAD_STRING (RASBASE+37) +#define ERROR_REQUEST_TIMEOUT (RASBASE+38) +#define ERROR_CANNOT_GET_LANA (RASBASE+39) +#define ERROR_NETBIOS_ERROR (RASBASE+40) +#define ERROR_SERVER_OUT_OF_RESOURCES (RASBASE+41) +#define ERROR_NAME_EXISTS_ON_NET (RASBASE+42) +#define ERROR_SERVER_GENERAL_NET_FAILURE (RASBASE+43) +#define WARNING_MSG_ALIAS_NOT_ADDED (RASBASE+44) +#define ERROR_AUTH_INTERNAL (RASBASE+45) +#define ERROR_RESTRICTED_LOGON_HOURS (RASBASE+46) +#define ERROR_ACCT_DISABLED (RASBASE+47) +#define ERROR_PASSWD_EXPIRED (RASBASE+48) +#define ERROR_NO_DIALIN_PERMISSION (RASBASE+49) +#define ERROR_SERVER_NOT_RESPONDING (RASBASE+50) +#define ERROR_FROM_DEVICE (RASBASE+51) +#define ERROR_UNRECOGNIZED_RESPONSE (RASBASE+52) +#define ERROR_MACRO_NOT_FOUND (RASBASE+53) +#define ERROR_MACRO_NOT_DEFINED (RASBASE+54) +#define ERROR_MESSAGE_MACRO_NOT_FOUND (RASBASE+55) +#define ERROR_DEFAULTOFF_MACRO_NOT_FOUND (RASBASE+56) +#define ERROR_FILE_COULD_NOT_BE_OPENED (RASBASE+57) +#define ERROR_DEVICENAME_TOO_LONG (RASBASE+58) +#define ERROR_DEVICENAME_NOT_FOUND (RASBASE+59) +#define ERROR_NO_RESPONSES (RASBASE+60) +#define ERROR_NO_COMMAND_FOUND (RASBASE+61) +#define ERROR_WRONG_KEY_SPECIFIED (RASBASE+62) +#define ERROR_UNKNOWN_DEVICE_TYPE (RASBASE+63) +#define ERROR_ALLOCATING_MEMORY (RASBASE+64) +#define ERROR_PORT_NOT_CONFIGURED (RASBASE+65) +#define ERROR_DEVICE_NOT_READY (RASBASE+66) +#define ERROR_READING_INI_FILE (RASBASE+67) +#define ERROR_NO_CONNECTION (RASBASE+68) +#define ERROR_BAD_USAGE_IN_INI_FILE (RASBASE+69) +#define ERROR_READING_SECTIONNAME (RASBASE+70) +#define ERROR_READING_DEVICETYPE (RASBASE+71) +#define ERROR_READING_DEVICENAME (RASBASE+72) +#define ERROR_READING_USAGE (RASBASE+73) +#define ERROR_READING_MAXCONNECTBPS (RASBASE+74) +#define ERROR_READING_MAXCARRIERBPS (RASBASE+75) +#define ERROR_LINE_BUSY (RASBASE+76) +#define ERROR_VOICE_ANSWER (RASBASE+77) +#define ERROR_NO_ANSWER (RASBASE+78) +#define ERROR_NO_CARRIER (RASBASE+79) +#define ERROR_NO_DIALTONE (RASBASE+80) +#define ERROR_IN_COMMAND (RASBASE+81) +#define ERROR_WRITING_SECTIONNAME (RASBASE+82) +#define ERROR_WRITING_DEVICETYPE (RASBASE+83) +#define ERROR_WRITING_DEVICENAME (RASBASE+84) +#define ERROR_WRITING_MAXCONNECTBPS (RASBASE+85) +#define ERROR_WRITING_MAXCARRIERBPS (RASBASE+86) +#define ERROR_WRITING_USAGE (RASBASE+87) +#define ERROR_WRITING_DEFAULTOFF (RASBASE+88) +#define ERROR_READING_DEFAULTOFF (RASBASE+89) +#define ERROR_EMPTY_INI_FILE (RASBASE+90) +#define ERROR_AUTHENTICATION_FAILURE (RASBASE+91) +#define ERROR_PORT_OR_DEVICE (RASBASE+92) +#define ERROR_NOT_BINARY_MACRO (RASBASE+93) +#define ERROR_DCB_NOT_FOUND (RASBASE+94) #define ERROR_STATE_MACHINES_NOT_STARTED (RASBASE+95) +#define ERROR_STATE_MACHINES_ALREADY_STARTED (RASBASE+96) +#define ERROR_PARTIAL_RESPONSE_LOOPING (RASBASE+97) +#define ERROR_UNKNOWN_RESPONSE_KEY (RASBASE+98) +#define ERROR_RECV_BUF_FULL (RASBASE+99) +#define ERROR_CMD_TOO_LONG (RASBASE+100) +#define ERROR_UNSUPPORTED_BPS (RASBASE+101) +#define ERROR_UNEXPECTED_RESPONSE (RASBASE+102) +#define ERROR_INTERACTIVE_MODE (RASBASE+103) +#define ERROR_BAD_CALLBACK_NUMBER (RASBASE+104) +#define ERROR_INVALID_AUTH_STATE (RASBASE+105) +#define ERROR_WRITING_INITBPS (RASBASE+106) +#define ERROR_X25_DIAGNOSTIC (RASBASE+107) +#define ERROR_ACCT_EXPIRED (RASBASE+108) +#define ERROR_CHANGING_PASSWORD (RASBASE+109) +#define ERROR_OVERRUN (RASBASE+110) #define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111) +#define ERROR_BIPLEX_PORT_NOT_AVAILABLE (RASBASE+112) +#define ERROR_NO_ACTIVE_ISDN_LINES (RASBASE+113) +#define ERROR_NO_ISDN_CHANNELS_AVAILABLE (RASBASE+114) +#define ERROR_TOO_MANY_LINE_ERRORS (RASBASE+115) +#define ERROR_IP_CONFIGURATION (RASBASE+116) +#define ERROR_NO_IP_ADDRESSES (RASBASE+117) +#define ERROR_PPP_TIMEOUT (RASBASE+118) +#define ERROR_PPP_REMOTE_TERMINATED (RASBASE+119) +#define ERROR_PPP_NO_PROTOCOLS_CONFIGURED (RASBASE+120) +#define ERROR_PPP_NO_RESPONSE (RASBASE+121) +#define ERROR_PPP_INVALID_PACKET (RASBASE+122) +#define ERROR_PHONE_NUMBER_TOO_LONG (RASBASE+123) +#define ERROR_IPXCP_NO_DIALOUT_CONFIGURED (RASBASE+124) +#define ERROR_IPXCP_NO_DIALIN_CONFIGURED (RASBASE+125) +#define ERROR_IPXCP_DIALOUT_ALREADY_ACTIVE (RASBASE+126) +#define ERROR_ACCESSING_TCPCFGDLL (RASBASE+127) +#define ERROR_NO_IP_RAS_ADAPTER (RASBASE+128) +#define ERROR_SLIP_REQUIRES_IP (RASBASE+129) +#define ERROR_PROJECTION_NOT_COMPLETE (RASBASE+130) +#define ERROR_PROTOCOL_NOT_CONFIGURED (RASBASE+131) +#define ERROR_PPP_NOT_CONVERGING (RASBASE+132) +#define ERROR_PPP_CP_REJECTED (RASBASE+133) +#define ERROR_PPP_LCP_TERMINATED (RASBASE+134) +#define ERROR_PPP_REQUIRED_ADDRESS_REJECTED (RASBASE+135) +#define ERROR_PPP_NCP_TERMINATED (RASBASE+136) +#define ERROR_PPP_LOOPBACK_DETECTED (RASBASE+137) +#define ERROR_PPP_NO_ADDRESS_ASSIGNED (RASBASE+138) +#define ERROR_CANNOT_USE_LOGON_CREDENTIALS (RASBASE+139) +#define ERROR_TAPI_CONFIGURATION (RASBASE+140) +#define ERROR_NO_LOCAL_ENCRYPTION (RASBASE+141) +#define ERROR_NO_REMOTE_ENCRYPTION (RASBASE+142) +#define ERROR_REMOTE_REQUIRES_ENCRYPTION (RASBASE+143) +#define ERROR_IPXCP_NET_NUMBER_CONFLICT (RASBASE+144) +#define ERROR_INVALID_SMM (RASBASE+145) +#define ERROR_SMM_UNINITIALIZED (RASBASE+146) +#define ERROR_NO_MAC_FOR_PORT (RASBASE+147) +#define ERROR_SMM_TIMEOUT (RASBASE+148) +#define ERROR_BAD_PHONE_NUMBER (RASBASE+149) +#define ERROR_WRONG_MODULE (RASBASE+150) +#define ERROR_INVALID_CALLBACK_NUMBER (RASBASE+151) +#define ERROR_SCRIPT_SYNTAX (RASBASE+152) +#define ERROR_HANGUP_FAILED (RASBASE+153) +#define ERROR_BUNDLE_NOT_FOUND (RASBASE+154) +#define ERROR_CANNOT_DO_CUSTOMDIAL (RASBASE+155) +#define ERROR_DIAL_ALREADY_IN_PROGRESS (RASBASE+156) +#define ERROR_RASAUTO_CANNOT_INITIALIZE (RASBASE+157) +#define ERROR_CONNECTION_ALREADY_SHARED (RASBASE+158) +#define ERROR_SHARING_CHANGE_FAILED (RASBASE+159) +#define ERROR_SHARING_ROUTER_INSTALL (RASBASE+160) +#define ERROR_SHARE_CONNECTION_FAILED (RASBASE+161) +#define ERROR_SHARING_PRIVATE_INSTALL (RASBASE+162) +#define ERROR_CANNOT_SHARE_CONNECTION (RASBASE+163) +#define ERROR_NO_SMART_CARD_READER (RASBASE+164) +#define ERROR_SHARING_ADDRESS_EXISTS (RASBASE+165) +#define ERROR_NO_CERTIFICATE (RASBASE+166) +#define ERROR_SHARING_MULTIPLE_ADDRESSES (RASBASE+167) +#define ERROR_FAILED_TO_ENCRYPT (RASBASE+168) +#define ERROR_BAD_ADDRESS_SPECIFIED (RASBASE+169) +#define ERROR_CONNECTION_REJECT (RASBASE+170) +#define ERROR_CONGESTION (RASBASE+171) +#define ERROR_INCOMPATIBLE (RASBASE+172) +#define ERROR_NUMBERCHANGED (RASBASE+173) +#define ERROR_TEMPFAILURE (RASBASE+174) +#define ERROR_BLOCKED (RASBASE+175) +#define ERROR_DONOTDISTURB (RASBASE+176) +#define ERROR_OUTOFORDER (RASBASE+177) +#define ERROR_UNABLE_TO_AUTHENTICATE_SERVER (RASBASE+178) +#define ERROR_SMART_CARD_REQUIRED (RASBASE+179) +#define ERROR_INVALID_FUNCTION_FOR_ENTRY (RASBASE+180) +#define ERROR_CERT_FOR_ENCRYPTION_NOT_FOUND (RASBASE+181) +#define ERROR_SHARING_RRAS_CONFLICT (RASBASE+182) +#define ERROR_SHARING_NO_PRIVATE_LAN (RASBASE+183) +#define ERROR_NO_DIFF_USER_AT_LOGON (RASBASE+184) +#define ERROR_NO_REG_CERT_AT_LOGON (RASBASE+185) +#define ERROR_OAKLEY_NO_CERT (RASBASE+186) +#define ERROR_OAKLEY_AUTH_FAIL (RASBASE+187) +#define ERROR_OAKLEY_ATTRIB_FAIL (RASBASE+188) +#define ERROR_OAKLEY_GENERAL_PROCESSING (RASBASE+189) +#define ERROR_OAKLEY_NO_PEER_CERT (RASBASE+190) +#define ERROR_OAKLEY_NO_POLICY (RASBASE+191) +#define ERROR_OAKLEY_TIMED_OUT (RASBASE+192) +#define ERROR_OAKLEY_ERROR (RASBASE+193) +#define ERROR_UNKNOWN_FRAMED_PROTOCOL (RASBASE+194) +#define ERROR_WRONG_TUNNEL_TYPE (RASBASE+195) +#define ERROR_UNKNOWN_SERVICE_TYPE (RASBASE+196) +#define ERROR_CONNECTING_DEVICE_NOT_FOUND (RASBASE+197) +#define ERROR_NO_EAPTLS_CERTIFICATE (RASBASE+198) +#define ERROR_SHARING_HOST_ADDRESS_CONFLICT (RASBASE+199) +#define ERROR_AUTOMATIC_VPN_FAILED (RASBASE+200) +#define ERROR_VALIDATING_SERVER_CERT (RASBASE+201) +#define ERROR_READING_SCARD (RASBASE+202) +#define ERROR_INVALID_PEAP_COOKIE_CONFIG (RASBASE+203) +#define ERROR_INVALID_PEAP_COOKIE_USER (RASBASE+204) +#define ERROR_INVALID_MSCHAPV2_CONFIG (RASBASE+205) +#define ERROR_VPN_GRE_BLOCKED (RASBASE+206) +#define ERROR_VPN_DISCONNECT (RASBASE+207) +#define ERROR_VPN_REFUSED (RASBASE+208) +#define ERROR_VPN_TIMEOUT (RASBASE+209) +#define ERROR_VPN_BAD_CERT (RASBASE+210) +#define ERROR_VPN_BAD_PSK (RASBASE+211) +#define ERROR_SERVER_POLICY (RASBASE+212) +#define ERROR_BROADBAND_ACTIVE (RASBASE+213) +#define ERROR_BROADBAND_NO_NIC (RASBASE+214) +#define ERROR_BROADBAND_TIMEOUT (RASBASE+215) +#define ERROR_FEATURE_DEPRECATED (RASBASE+216) +#define ERROR_CANNOT_DELETE (RASBASE+217) +#define ERROR_RASQEC_RESOURCE_CREATION_FAILED (RASBASE+218) +#define ERROR_RASQEC_NAPAGENT_NOT_ENABLED (RASBASE+219) +#define ERROR_RASQEC_NAPAGENT_NOT_CONNECTED (RASBASE+220) +#define ERROR_RASQEC_CONN_DOESNOTEXIST (RASBASE+221) +#define ERROR_RASQEC_TIMEOUT (RASBASE+222) +#define ERROR_PEAP_CRYPTOBINDING_INVALID (RASBASE+223) +#define ERROR_PEAP_CRYPTOBINDING_NOTRECEIVED (RASBASE+224) +#define ERROR_INVALID_VPNSTRATEGY (RASBASE+225) +#define ERROR_EAPTLS_CACHE_CREDENTIALS_INVALID (RASBASE+226) +#define ERROR_IPSEC_SERVICE_STOPPED (RASBASE+227) +#define ERROR_IDLE_TIMEOUT (RASBASE+228) +#define ERROR_LINK_FAILURE (RASBASE+229) +#define ERROR_USER_LOGOFF (RASBASE+230) +#define ERROR_FAST_USER_SWITCH (RASBASE+231) +#define ERROR_HIBERNATION (RASBASE+232) +#define ERROR_SYSTEM_SUSPENDED (RASBASE+233) +#define ERROR_RASMAN_SERVICE_STOPPED (RASBASE+234) +#define ERROR_INVALID_SERVER_CERT (RASBASE+235) +#define ERROR_NOT_NAP_CAPABLE (RASBASE+236) +#define ERROR_INVALID_TUNNELID (RASBASE+237) +#define ERROR_UPDATECONNECTION_REQUEST_IN_PROCESS (RASBASE+238) +#define ERROR_PROTOCOL_ENGINE_DISABLED (RASBASE+239) +#define ERROR_INTERNAL_ADDRESS_FAILURE (RASBASE+240) +#define ERROR_FAILED_CP_REQUIRED (RASBASE+241) +#define ERROR_TS_UNACCEPTABLE (RASBASE+242) +#define ERROR_MOBIKE_DISABLED (RASBASE+243) +#define ERROR_CANNOT_INITIATE_MOBIKE_UPDATE (RASBASE+244) +#define ERROR_PEAP_SERVER_REJECTED_CLIENT_TLV (RASBASE+245) +#define ERROR_INVALID_PREFERENCES (RASBASE+246) +#define ERROR_EAPTLS_SCARD_CACHE_CREDENTIALS_INVALID (RASBASE+247) +#define ERROR_SSTP_COOKIE_SET_FAILURE (RASBASE+248) +#define ERROR_INVALID_PEAP_COOKIE_ATTRIBUTES (RASBASE+249) +#define ERROR_EAP_METHOD_NOT_INSTALLED (RASBASE+250) +#define ERROR_EAP_METHOD_DOES_NOT_SUPPORT_SSO (RASBASE+251) +#define ERROR_EAP_METHOD_OPERATION_NOT_SUPPORTED (RASBASE+252) +#define ERROR_EAP_USER_CERT_INVALID (RASBASE+253) +#define ERROR_EAP_USER_CERT_EXPIRED (RASBASE+254) +#define ERROR_EAP_USER_CERT_REVOKED (RASBASE+255) +#define ERROR_EAP_USER_CERT_OTHER_ERROR (RASBASE+256) +#define ERROR_EAP_SERVER_CERT_INVALID (RASBASE+257) +#define ERROR_EAP_SERVER_CERT_EXPIRED (RASBASE+258) +#define ERROR_EAP_SERVER_CERT_REVOKED (RASBASE+259) +#define ERROR_EAP_SERVER_CERT_OTHER_ERROR (RASBASE+260) +#define ERROR_EAP_USER_ROOT_CERT_NOT_FOUND (RASBASE+261) +#define ERROR_EAP_USER_ROOT_CERT_INVALID (RASBASE+262) +#define ERROR_EAP_USER_ROOT_CERT_EXPIRED (RASBASE+263) +#define ERROR_EAP_SERVER_ROOT_CERT_NOT_FOUND (RASBASE+264) +#define ERROR_EAP_SERVER_ROOT_CERT_INVALID (RASBASE+265) +#define ERROR_EAP_SERVER_ROOT_CERT_NAME_REQUIRED (RASBASE+266) +#define ERROR_PEAP_IDENTITY_MISMATCH (RASBASE+267) +#define ERROR_DNSNAME_NOT_RESOLVABLE (RASBASE+268) +#define ERROR_EAPTLS_PASSWD_INVALID (RASBASE+269) +#define ERROR_IKEV2_PSK_INTERFACE_ALREADY_EXISTS (RASBASE+270) +#define ERROR_INVALID_DESTINATION_IP (RASBASE+271) +#define ERROR_INVALID_INTERFACE_CONFIG (RASBASE+272) +#define RASBASEEND (RASBASE+272) +#define ERROR_VPN_PLUGIN_GENERIC (RASBASE+273) +#define ERROR_SSO_CERT_MISSING (RASBASE+274) +#define ERROR_DEVICE_COMPLIANCE (RASBASE+275) #endif -- 2.21.0

1 0

[PATCH] gdi32/tests: Remove the D3DKMTCreateDCFromMemory test with Width = 0.
by Sven Baars 21 Nov '19

21 Nov '19

This test fails with STATUS_INVALID_PARAMETER on Windows 7+. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This supersedes 173429. dlls/gdi32/tests/bitmap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index c1651b5a2b..8fe160546c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5780,20 +5780,6 @@ static void test_D3DKMTCreateDCFromMemory( void ) test_data[i].name, create_desc.hBitmap); create_desc.Height = 7; - create_desc.Width = 0; - status = pD3DKMTCreateDCFromMemory( &create_desc ); - ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n", - test_data[i].name, status, test_data[i].status); - if (status == STATUS_SUCCESS) - { - destroy_desc.hDc = create_desc.hDc; - destroy_desc.hBitmap = create_desc.hBitmap; - status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); - ok(status == STATUS_SUCCESS, "%s: Got unexpected status %#x.\n", test_data[i].name, status); - create_desc.hDc = (void *)0x010baade; - create_desc.hBitmap = (void *)0x020baade; - } - create_desc.Pitch = 0; status = pD3DKMTCreateDCFromMemory( &create_desc ); ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n", -- 2.17.1

2 1

[PATCH] comctl32/rebar: Fix invalid band index access.
by Nikolay Sivov 21 Nov '19

21 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47991 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/rebar.c | 6 ++++-- dlls/comctl32/tests/rebar.c | 21 ++++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 8c667a192b..6bca2f1818 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1298,8 +1298,8 @@ static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT i REBAR_BAND *lpBand; int yMaxHeight = 0; int yPos = yStart; - int row = REBAR_GetBand(infoPtr, iBeginBand)->iRow; - int i; + int row, i; + for (i = iBeginBand; i < iEndBand; i = next_visible(infoPtr, i)) { lpBand = REBAR_GetBand(infoPtr, i); @@ -1308,6 +1308,8 @@ static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT i } TRACE("Bands [%d; %d) height: %d\n", iBeginBand, iEndBand, yMaxHeight); + row = iBeginBand < iEndBand ? REBAR_GetBand(infoPtr, iBeginBand)->iRow : 0; + for (i = iBeginBand; i < iEndBand; i = next_visible(infoPtr, i)) { lpBand = REBAR_GetBand(infoPtr, i); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 3b1be77497..6c82295d40 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -499,6 +499,7 @@ static void test_layout(void) REBARBANDINFOA rbi; HIMAGELIST himl; REBARINFO ri; + int count; rbsize_results_init(); @@ -660,9 +661,27 @@ static void test_layout(void) SendMessageA(hRebar, RB_INSERTBANDA, -1, (LPARAM)&rbi); check_sizes(); - rbsize_results_free(); DestroyWindow(hRebar); pImageList_Destroy(himl); + + /* One hidden band. */ + hRebar = create_rebar_control(); + + rbi.cbSize = REBARBANDINFOA_V6_SIZE; + rbi.fMask = RBBIM_STYLE | RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; + rbi.fStyle = RBBS_HIDDEN; + rbi.cx = 200; + rbi.cxMinChild = 100; + rbi.cyMinChild = 30; + rbi.hwndChild = NULL; + + SendMessageA(hRebar, RB_INSERTBANDA, -1, (LPARAM)&rbi); + count = SendMessageA(hRebar, RB_GETROWCOUNT, 0, 0); + ok(!count, "Unexpected row count %d.\n", count); + + DestroyWindow(hRebar); + + rbsize_results_free(); } #if 0 /* use this to generate more tests */ -- 2.24.0

1 0

[PATCH] kernelbase: When enumerating calendars initialize optional to 0.
by Dmitry Timoshkov 20 Nov '19

20 Nov '19

This fixes regression introduced by 42ed9797b1929fc5917bd967f7062cab953fab55. Without this patch Internal_EnumCalendarInfo() goes into infinite loop when asked to enumerate particular calendar id. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4ec5016b3f..073d759936 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -173,7 +173,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, BOOL exex, LPARAM lparam ) { WCHAR buffer[256]; - DWORD optional; + DWORD optional = 0; INT ret; if (!proc) -- 2.20.1

1 0

[PATCH v2 1/6] quartz/tests: Add some tests for allocator negotiation on the VMR7.
by Zebediah Figura 20 Nov '19

20 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 73017290fb..fdd493c089 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -960,6 +960,56 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &testsource_vtbl, &filter->filter, L"", &testsource_ops); } +static void test_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props, req_props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + req_props.cBuffers = 1; + req_props.cbBuffer = 32 * 16 * 4; + req_props.cbAlign = 1; + req_props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(ret_allocator, &req_props, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(props.cBuffers == 1, "Got %d buffers.\n", props.cBuffers); + ok(props.cbBuffer == 32 * 16 * 4, "Got size %d.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + IMemAllocator_Release(req_allocator); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -981,6 +1031,7 @@ static void test_connect_pin(void) IBaseFilter *filter = create_vmr7(VMRMode_Windowed); IFilterGraph2 *graph = create_graph(); struct testfilter source; + IMemInputPin *input; AM_MEDIA_TYPE mt; IPin *pin, *peer; unsigned int i; @@ -1073,6 +1124,10 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + + test_allocator(input); + hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); @@ -1088,6 +1143,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.24.0

2 7

[PATCH 1/6] quartz/tests: Add some tests for allocator negotiation on the VMR7.
by Zebediah Figura 20 Nov '19

20 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 73017290fb..fdd493c089 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -960,6 +960,56 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &testsource_vtbl, &filter->filter, L"", &testsource_ops); } +static void test_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props, req_props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + req_props.cBuffers = 1; + req_props.cbBuffer = 32 * 16 * 4; + req_props.cbAlign = 1; + req_props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(ret_allocator, &req_props, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(props.cBuffers == 1, "Got %d buffers.\n", props.cBuffers); + ok(props.cbBuffer == 32 * 16 * 4, "Got size %d.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + IMemAllocator_Release(req_allocator); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -981,6 +1031,7 @@ static void test_connect_pin(void) IBaseFilter *filter = create_vmr7(VMRMode_Windowed); IFilterGraph2 *graph = create_graph(); struct testfilter source; + IMemInputPin *input; AM_MEDIA_TYPE mt; IPin *pin, *peer; unsigned int i; @@ -1073,6 +1124,10 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + + test_allocator(input); + hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); @@ -1088,6 +1143,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.24.0

2 9

[PATCH] windowscodecs: Fix tiffformat test on current Windows 10.
by Vincent Povirk 20 Nov '19

20 Nov '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- I'd prefer we get a sign-off or feedback from Dmitry before committing this if possible. On current Windows 10, QueryCapability leaves the stream position at 0, causing the stream position test to fail, as well as a later test showing native fails when the stream position isn't at the start. I figure Windows has shown every possible behavior, so there's no point in testing the position, but we should set it to show that CreateDecoderFromStream still cares about the stream position. dlls/windowscodecs/tests/tiffformat.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 2f9a0ca65f0..861e620e44d 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -405,7 +405,6 @@ static void test_QueryCapability(void) WICBitmapDecoderCapabilityCanDecodeSomeImages; DWORD capability; LARGE_INTEGER pos; - ULARGE_INTEGER cur_pos; UINT frame_count; stream = create_stream(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); @@ -442,11 +441,9 @@ static void test_QueryCapability(void) ok(hr == S_OK, "GetFrame error %#x\n", hr); IWICBitmapFrameDecode_Release(frame); - pos.QuadPart = 0; - hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); + pos.QuadPart = 5; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); - ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data), - "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); @@ -456,6 +453,7 @@ static void test_QueryCapability(void) IWICBitmapDecoder_Release(decoder); + /* CreateDecoderFromStream fails if seeked past the start */ hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); -- 2.17.1

2 1