wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Alex Henrie : wlanapi: Add WlanHostedNetworkQueryStatus stub.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: d1b2097390c13fe241b978f82944084a1e9b4ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b2097390c13fe241b978f8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:51 2021 -0600 wlanapi: Add WlanHostedNetworkQueryStatus stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 7 +++++++ dlls/wlanapi/wlanapi.spec | 1 + include/windot11.h | 3 +++ include/wlanapi.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index a865d39f40d..07264c9e136 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -193,6 +193,13 @@ DWORD WINAPI WlanHostedNetworkQuerySecondaryKey(HANDLE handle, DWORD *key_size, return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanHostedNetworkQueryStatus(HANDLE handle, WLAN_HOSTED_NETWORK_STATUS *status, void *reserved) +{ + FIXME("(%p, %p, %p) stub\n", handle, status, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index c0ea019ba58..45d83c80b0f 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -16,6 +16,7 @@ @ stub WlanGetSecuritySettings @ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) @ stdcall WlanHostedNetworkQuerySecondaryKey(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall WlanHostedNetworkQueryStatus(ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/windot11.h b/include/windot11.h index e14ed738213..39effeb93ec 100644 --- a/include/windot11.h +++ b/include/windot11.h @@ -35,4 +35,7 @@ typedef enum _DOT11_PHY_TYPE dot11_phy_type_IHV_end = 0xFFFFFFFF } DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; +typedef UCHAR DOT11_MAC_ADDRESS[6]; +typedef DOT11_MAC_ADDRESS *PDOT11_MAC_ADDRESS; + #endif /* _WINDOT11_H */ diff --git a/include/wlanapi.h b/include/wlanapi.h index 02b787e09a1..13118cbf303 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -214,6 +214,36 @@ typedef enum _WLAN_HOSTED_NETWORK_REASON wlan_hosted_network_reason_service_available_on_virtual_station } WLAN_HOSTED_NETWORK_REASON, *PWLAN_HOSTED_NETWORK_REASON; +typedef enum _WLAN_HOSTED_NETWORK_STATE +{ + wlan_hosted_network_unavailable, + wlan_hosted_network_idle, + wlan_hosted_network_active +} WLAN_HOSTED_NETWORK_STATE, *PWLAN_HOSTED_NETWORK_STATE; + +typedef enum _WLAN_HOSTED_NETWORK_PEER_AUTH_STATE +{ + wlan_hosted_network_peer_state_invalid, + wlan_hosted_network_peer_state_authenticated +} WLAN_HOSTED_NETWORK_PEER_AUTH_STATE, *PWLAN_HOSTED_NETWORK_PEER_AUTH_STATE; + +typedef struct _WLAN_HOSTED_NETWORK_PEER_STATE +{ + DOT11_MAC_ADDRESS PeerMacAddress; + WLAN_HOSTED_NETWORK_PEER_AUTH_STATE PeerAuthState; +} WLAN_HOSTED_NETWORK_PEER_STATE, *PWLAN_HOSTED_NETWORK_PEER_STATE; + +typedef struct _WLAN_HOSTED_NETWORK_STATUS +{ + WLAN_HOSTED_NETWORK_STATE HostedNetworkState; + GUID IPDeviceID; + DOT11_MAC_ADDRESS wlanHostedNetworkBSSID; + DOT11_PHY_TYPE dot11PhyType; + ULONG ulChannelFrequency; + DWORD dwNumberOfPeers; + WLAN_HOSTED_NETWORK_PEER_STATE PeerList[1]; +} WLAN_HOSTED_NETWORK_STATUS, *PWLAN_HOSTED_NETWORK_STATUS; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Alex Henrie : include: Move DOT11_PHY_TYPE to windot11.h.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 946c128bc2ab035d2d61f7683b7361e6ac864218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=946c128bc2ab035d2d61f768… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:50 2021 -0600 include: Move DOT11_PHY_TYPE to windot11.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windot11.h | 38 ++++++++++++++++++++++++++++++++++++++ include/wlanapi.h | 18 ++---------------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 9b397ffa183..3dbfe6561f2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -759,6 +759,7 @@ SOURCES = \ wincrypt.h \ windef.h \ windns.h \ + windot11.h \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ diff --git a/include/windot11.h b/include/windot11.h new file mode 100644 index 00000000000..e14ed738213 --- /dev/null +++ b/include/windot11.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINDOT11_H +#define _WINDOT11_H + +typedef enum _DOT11_PHY_TYPE +{ + dot11_phy_type_unknown = 0x00, + dot11_phy_type_any = 0x00, + dot11_phy_type_fhss = 0x01, + dot11_phy_type_dsss = 0x02, + dot11_phy_type_irbaseband = 0x03, + dot11_phy_type_ofdm = 0x04, + dot11_phy_type_hrdsss = 0x05, + dot11_phy_type_erp = 0x06, + dot11_phy_type_ht = 0x07, + dot11_phy_type_vht = 0x08, + dot11_phy_type_IHV_start = 0x80000000, + dot11_phy_type_IHV_end = 0xFFFFFFFF +} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; + +#endif /* _WINDOT11_H */ diff --git a/include/wlanapi.h b/include/wlanapi.h index 80de128a60f..02b787e09a1 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -19,6 +19,8 @@ #ifndef _WLAN_WLANAPI_H #define _WLAN_WLANAPI_H +#include <windot11.h> + typedef enum _WLAN_INTERFACE_STATE { wlan_interface_state_not_ready, @@ -105,22 +107,6 @@ typedef enum _DOT11_CIPHER_ALGORITHM DOT11_CIPHER_ALGO_IHV_END = 0xFFFFFFFF } DOT11_CIPHER_ALGORITHM, *PDOT11_CIPHER_ALGORITHM; -typedef enum _DOT11_PHY_TYPE -{ - dot11_phy_type_unknown = 0x00, - dot11_phy_type_any = 0x00, - dot11_phy_type_fhss = 0x01, - dot11_phy_type_dsss = 0x02, - dot11_phy_type_irbaseband = 0x03, - dot11_phy_type_ofdm = 0x04, - dot11_phy_type_hrdsss = 0x05, - dot11_phy_type_erp = 0x06, - dot11_phy_type_ht = 0x07, - dot11_phy_type_vht = 0x08, - dot11_phy_type_IHV_start = 0x80000000, - dot11_phy_type_IHV_end = 0xFFFFFFFF -} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; - #define WLAN_MAX_PHY_TYPE_NUMBER 8 typedef struct _WLAN_AVAILABLE_NETWORK

1 0

Alex Henrie : wlanapi: Add WlanHostedNetworkQuerySecondaryKey stub.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: acb88df0113e1a637ee0b5bd6e645c00ebf92b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb88df0113e1a637ee0b5bd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:49 2021 -0600 wlanapi: Add WlanHostedNetworkQuerySecondaryKey stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 10 ++++++++++ dlls/wlanapi/wlanapi.spec | 1 + include/wlanapi.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index bbe560bcd8d..a865d39f40d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -183,6 +183,16 @@ DWORD WINAPI WlanHostedNetworkQueryProperty(HANDLE handle, WLAN_HOSTED_NETWORK_O return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanHostedNetworkQuerySecondaryKey(HANDLE handle, DWORD *key_size, unsigned char *key, + BOOL *passphrase, BOOL *persistent, + WLAN_HOSTED_NETWORK_REASON *error, void *reserved) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %p) stub\n", + handle, key_size, key, passphrase, persistent, error, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 8931112fcf8..c0ea019ba58 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -15,6 +15,7 @@ @ stub WlanGetProfileList @ stub WlanGetSecuritySettings @ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) +@ stdcall WlanHostedNetworkQuerySecondaryKey(ptr ptr ptr ptr ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/wlanapi.h b/include/wlanapi.h index 10f7cae0f61..80de128a60f 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -195,6 +195,39 @@ typedef enum _WLAN_HOSTED_NETWORK_OPCODE wlan_hosted_network_opcode_enable } WLAN_HOSTED_NETWORK_OPCODE, *PWLAN_HOSTED_NETWORK_OPCODE; +typedef enum _WLAN_HOSTED_NETWORK_REASON +{ + wlan_hosted_network_reason_success = 0, + wlan_hosted_network_reason_unspecified, + wlan_hosted_network_reason_bad_parameters, + wlan_hosted_network_reason_service_shutting_down, + wlan_hosted_network_reason_insufficient_resources, + wlan_hosted_network_reason_elevation_required, + wlan_hosted_network_reason_read_only, + wlan_hosted_network_reason_persistence_failed, + wlan_hosted_network_reason_crypt_error, + wlan_hosted_network_reason_impersonation, + wlan_hosted_network_reason_stop_before_start, + wlan_hosted_network_reason_interface_available, + wlan_hosted_network_reason_interface_unavailable, + wlan_hosted_network_reason_miniport_stopped, + wlan_hosted_network_reason_miniport_started, + wlan_hosted_network_reason_incompatible_connection_started, + wlan_hosted_network_reason_incompatible_connection_stopped, + wlan_hosted_network_reason_user_action, + wlan_hosted_network_reason_client_abort, + wlan_hosted_network_reason_ap_start_failed, + wlan_hosted_network_reason_peer_arrived, + wlan_hosted_network_reason_peer_departed, + wlan_hosted_network_reason_peer_timeout, + wlan_hosted_network_reason_gp_denied, + wlan_hosted_network_reason_service_unavailable, + wlan_hosted_network_reason_device_change, + wlan_hosted_network_reason_properties_change, + wlan_hosted_network_reason_virtual_station_blocking_use, + wlan_hosted_network_reason_service_available_on_virtual_station +} WLAN_HOSTED_NETWORK_REASON, *PWLAN_HOSTED_NETWORK_REASON; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Alex Henrie : wlanapi: Add WlanHostedNetworkQueryProperty stub.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 2c4601b6eed90ec69082adc556b0cfff70d868dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c4601b6eed90ec69082adc5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:48 2021 -0600 wlanapi: Add WlanHostedNetworkQueryProperty stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51469 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 11 +++++++++++ dlls/wlanapi/wlanapi.spec | 1 + include/wlanapi.h | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index d54cc1463ba..bbe560bcd8d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -172,6 +172,17 @@ DWORD WINAPI WlanQueryInterface(HANDLE handle, const GUID *guid, WLAN_INTF_OPCOD return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI WlanHostedNetworkQueryProperty(HANDLE handle, WLAN_HOSTED_NETWORK_OPCODE opcode, + DWORD *data_size, void **data, + WLAN_OPCODE_VALUE_TYPE *opcode_type, void *reserved) +{ + FIXME("(%p, 0x%x, %p, %p, %p, %p) stub\n", + handle, opcode, data_size, data, opcode_type, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 1c21ab5a2ea..8931112fcf8 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -14,6 +14,7 @@ @ stub WlanGetProfileCustomUserData @ stub WlanGetProfileList @ stub WlanGetSecuritySettings +@ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/wlanapi.h b/include/wlanapi.h index a3288d7778b..10f7cae0f61 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -187,6 +187,14 @@ typedef struct _WLAN_AVAILABLE_NETWORK_LIST WLAN_AVAILABLE_NETWORK Network[1]; } WLAN_AVAILABLE_NETWORK_LIST, *PWLAN_AVAILABLE_NETWORK_LIST; +typedef enum _WLAN_HOSTED_NETWORK_OPCODE +{ + wlan_hosted_network_opcode_connection_settings, + wlan_hosted_network_opcode_security_settings, + wlan_hosted_network_opcode_station_profile, + wlan_hosted_network_opcode_enable +} WLAN_HOSTED_NETWORK_OPCODE, *PWLAN_HOSTED_NETWORK_OPCODE; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Francois Gouget : oleaut32: Remove caching from VARIANT_GetLocalisedNumberChars().
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: d8656b47676a3448a19d9ee2da0c337e3cb64e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8656b47676a3448a19d9ee2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 5 15:20:45 2021 +0200 oleaut32: Remove caching from VARIANT_GetLocalisedNumberChars(). GetLocaleInfoW() already caches the registry information and is fast enough. This also avoids using out-of-date information after a SetLocaleInfoW() call. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 12 +++--------- dlls/oleaut32/variant.c | 28 ---------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bed4de469df..89859988f1f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2198,7 +2198,7 @@ static void test_VarParseNumFromStrMisc(void) /* But SMONDECIMALSEP has no default! */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L""); hres = wconvert_str(L"3.9", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"."); SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"."); @@ -2206,9 +2206,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L" "); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2225,9 +2223,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L" "); hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2235,9 +2231,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTFAIL; hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2298,14 +2292,14 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"\xa0"); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* Regular thousands separators also have precedence over the currency ones */ hres = wconvert_str(L"1\xa0\x30\x30\x30", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e4993de75a5..14ba63b9b2e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -42,14 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); -static CRITICAL_SECTION cache_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cache_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } -}; -static CRITICAL_SECTION cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, @@ -1519,24 +1511,9 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; - static VARIANT_NUMBER_CHARS lastChars; - static LCID lastLcid = -1; - static DWORD lastFlags = 0; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; - /* To make caching thread-safe, a critical section is needed */ - EnterCriticalSection(&cache_cs); - - /* Asking for default locale entries is very expensive: It is a registry - server call. So cache one locally, as Microsoft does it too */ - if(lcid == lastLcid && dwFlags == lastFlags) - { - memcpy(lpChars, &lastChars, sizeof(defaultChars)); - LeaveCriticalSection(&cache_cs); - return; - } - memcpy(lpChars, &defaultChars, sizeof(defaultChars)); GET_NUMBER_TEXT(LOCALE_SNEGATIVESIGN, cNegativeSymbol); GET_NUMBER_TEXT(LOCALE_SPOSITIVESIGN, cPositiveSymbol); @@ -1556,11 +1533,6 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID } TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2, wine_dbgstr_w(buff)); - - memcpy(&lastChars, lpChars, sizeof(defaultChars)); - lastLcid = lcid; - lastFlags = dwFlags; - LeaveCriticalSection(&cache_cs); } /* Number Parsing States */

1 0

Hugh McMaster : conhost: Copy font properties to the new screen buffer.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 3bf6b278826f951f5d2004d991170dd8bc7fbede URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf6b278826f951f5d2004d9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 5 13:57:14 2021 +0200 conhost: Copy font properties to the new screen buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 061f09989eb..ecfdd082a81 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -68,6 +68,7 @@ static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) if (screen_buffer->console->active == screen_buffer) screen_buffer->console->active = NULL; wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer->font.face_name ); free( screen_buffer->data ); free( screen_buffer ); } @@ -85,8 +86,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->font.weight = FW_NORMAL; - screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; if (console->active) { @@ -96,15 +95,22 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; screen_buffer->attr = console->active->attr; screen_buffer->popup_attr = console->active->attr; + screen_buffer->font = console->active->font; + + if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; + memcpy( screen_buffer->font.face_name, console->active->font.face_name, + screen_buffer->font.face_len ); } else { - screen_buffer->max_width = width; - screen_buffer->max_height = height; - screen_buffer->win.right = width - 1; - screen_buffer->win.bottom = height - 1; - screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; - screen_buffer->popup_attr = 0xf5; + screen_buffer->max_width = width; + screen_buffer->max_height = height; + screen_buffer->win.right = width - 1; + screen_buffer->win.bottom = height - 1; + screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; + screen_buffer->popup_attr = 0xf5; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))

1 0

Arkadiusz Hiler : dinput/tests: Make overlapped format tests more robust.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 5cb70e73f070def227f47bb307c1d5a483fc898c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb70e73f070def227f47bb3… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Aug 5 13:55:29 2021 +0300 dinput/tests: Make overlapped format tests more robust. Both Acquire() and event processing with DirectInput seem to be asynchronous. In most cases we can just keep hammering GetDeviceData() until the event gets processed. Things get pretty racy around Acquire() though. If we fire event right after the device is acquired we can find ourselves in one of the three situations: 1. Event happened after acquiring has completed - the wait will suffice. 2. Event happened before acquiring did any real work - the device will pick up the state as if the event was processed, but there's nothing in GetDeviceData(). Because of that we cannot fail on wait. 3. Event happened somewhere in the middle of acquiring - we ended up both missing the event for GetDeviceData() and we have outdated state. Sending event again will register as if the button was not already pressed. This change covers all three scenarios. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/device.c | 73 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 6307957b6e2..b21a02dfe56 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -343,11 +343,54 @@ static void pump_messages(void) } } +#define wait_for_device_data_and_discard(device) wait_for_device_data_and_discard_(__LINE__, device) +static BOOL wait_for_device_data_and_discard_(int line, IDirectInputDeviceA *device) +{ + DWORD cnt; + HRESULT hr; + DWORD start_time; + + pump_messages(); + + start_time = GetTickCount(); + do + { + cnt = 10; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), NULL, &cnt, 0); + ok_(__FILE__, line)(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceData() failed: %08x\n", hr); + ok_(__FILE__, line)(cnt == 0 || cnt == 1, "Unexpected number of events: %d\n", cnt); + } while (cnt != 1 && (GetTickCount() - start_time < 500)); + + return cnt == 1; +} + +#define acquire_and_wait(device, valid_dik) acquire_and_wait_(__LINE__, device, valid_dik) +static void acquire_and_wait_(int line, IDirectInputDeviceA *device, DWORD valid_dik) +{ + HRESULT hr; + int tries = 2; + + hr = IDirectInputDevice_Acquire(device); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + + do + { + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE, 0); + } while (!wait_for_device_data_and_discard(device) && tries--); + + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); + ok_(__FILE__, line)(wait_for_device_data_and_discard(device), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); +} + void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; struct overlapped_state state; IDirectInputDeviceA *keyboard = NULL; + DIPROPDWORD dp; + + SetFocus(hwnd); hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &keyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -355,15 +398,21 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped slider - default value 0 */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_slider_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 10; + hr = IDirectInputDevice_SetProperty(keyboard, DIPROP_BUFFERSIZE, &dp.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -377,7 +426,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); hr = IDirectInputDevice_Unacquire(keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); @@ -385,15 +435,13 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped pov - default value - 0xFFFFFFFF */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_pov_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -407,7 +455,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); if (keyboard) IUnknown_Release(keyboard); }

1 0

Paul Gofman : jscript: Fix use after free in Object_defineProperty().
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: a439f7202a9c8f06deb43f81d0f8704caf408162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a439f7202a9c8f06deb43f81… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 5 01:28:49 2021 +0300 jscript: Fix use after free in Object_defineProperty(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index c8c0572c839..169b47caea4 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -470,11 +470,15 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl }else { hres = JS_E_OBJECT_EXPECTED; } - jsstr_release(name_str); + if(FAILED(hres)) + { + jsstr_release(name_str); return hres; + } hres = jsdisp_define_property(obj, name, &prop_desc); + jsstr_release(name_str); release_property_descriptor(&prop_desc); if(SUCCEEDED(hres) && r) *r = jsval_obj(jsdisp_addref(obj));

1 0

Nikolay Sivov : gdi32: Use documented structure layout for EMF-to-WMF embedding records.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 0dab1e414a91fc78f9c5ff7c825bd3eafc33b829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dab1e414a91fc78f9c5ff7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 4 19:08:34 2021 +0300 gdi32: Use documented structure layout for EMF-to-WMF embedding records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/metafile.c | 10 ++++------ dlls/gdi32/ntgdi_private.h | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 25ffcff93bf..b12db98d9e6 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2804,7 +2804,7 @@ static HENHMETAFILE extract_emf_from_comment( const BYTE *buf, UINT mf_size ) chunk = (emf_in_wmf_comment *)(mr->rdParm + 2); if (mr->rdFunction != META_ESCAPE || mr->rdParm[0] != MFCOMMENT) goto done; - if (chunk->magic != WMFC_MAGIC) goto done; + if (chunk->comment_id != WMFC_MAGIC) goto done; if (!emf_bits) { diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index b0428960b50..6b4df5680ba 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1096,13 +1096,11 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; - chunk->magic = WMFC_MAGIC; - chunk->unk04 = 1; - chunk->unk06 = 0; - chunk->unk08 = 0; - chunk->unk0a = 1; + chunk->comment_id = WMFC_MAGIC; + chunk->comment_type = 0x1; + chunk->version = 0x00010000; chunk->checksum = 0; /* We fixup the first chunk's checksum before returning from GetWinMetaFileBits */ - chunk->unk0e = 0; + chunk->flags = 0; chunk->num_chunks = (size + max_chunk_size - 1) / max_chunk_size; chunk->chunk_size = max_chunk_size; chunk->remaining_size = size; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 5f3f88f870c..d256a356d01 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -462,13 +462,11 @@ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; #include <pshpack2.h> typedef struct { - DWORD magic; /* WMFC */ - WORD unk04; /* 1 */ - WORD unk06; /* 0 */ - WORD unk08; /* 0 */ - WORD unk0a; /* 1 */ + DWORD comment_id; /* WMFC */ + DWORD comment_type; /* Always 0x00000001 */ + DWORD version; /* Always 0x00010000 */ WORD checksum; - DWORD unk0e; /* 0 */ + DWORD flags; /* Always 0 */ DWORD num_chunks; DWORD chunk_size; DWORD remaining_size;

1 0

Alex Henrie : ws2_32: Hook up IPV6_PKTINFO.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: cade5944be82ac7dead3dd68e6d00871b3d41ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cade5944be82ac7dead3dd68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 23:08:39 2021 -0600 ws2_32: Hook up IPV6_PKTINFO. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++++++++++++++ configure.ac | 7 +++++++ dlls/ntdll/unix/socket.c | 23 +++++++++++++++++++++++ dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 8 -------- include/config.h.in | 3 +++ include/wine/afd.h | 2 ++ 7 files changed, 57 insertions(+), 8 deletions(-) diff --git a/configure b/configure index c159b12ad6d..8b1cbf407b1 100755 --- a/configure +++ b/configure @@ -19366,6 +19366,21 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct in6_pktinfo" "ipi6_addr" "ac_cv_member_struct_in6_pktinfo_ipi6_addr" "#ifdef HAVE_NETINET_IN_H +#define _GNU_SOURCE +#include <netinet/in.h> +#endif +" +if test "x$ac_cv_member_struct_in6_pktinfo_ipi6_addr" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR 1 +_ACEOF + + +fi + + ac_fn_c_check_member "$LINENO" "struct ipstat" "ips_total" "ac_cv_member_struct_ipstat_ips_total" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index b5d3217f2a0..a42c2aff272 100644 --- a/configure.ac +++ b/configure.ac @@ -2546,6 +2546,13 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, #include <netinet/icmp_var.h> #endif]) +dnl Check for struct in6_pktinfo +AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr],,, +[#ifdef HAVE_NETINET_IN_H +#define _GNU_SOURCE +#include <netinet/in.h> +#endif]) + dnl Check for struct ipstat AC_CHECK_MEMBERS([struct ipstat.ips_total],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 9b43de17b29..cc8d1426bb5 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -23,6 +23,7 @@ #endif #include "config.h" +#define _GNU_SOURCE /* for struct in6_pktinfo */ #include <errno.h> #include <sys/types.h> #include <unistd.h> @@ -466,6 +467,20 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } #endif /* IPV6_HOPLIMIT */ +#if defined(IPV6_PKTINFO) && defined(HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR) + case IPV6_PKTINFO: + { + struct in6_pktinfo *data_unix = (struct in6_pktinfo *)CMSG_DATA(cmsg_unix); + struct WS_in6_pktinfo data_win; + + memcpy(&data_win.ipi6_addr, &data_unix->ipi6_addr.s6_addr, 16); + data_win.ipi6_ifindex = data_unix->ipi6_ifindex; + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_PKTINFO, ptr, &ctlsize, + (void *)&data_win, sizeof(data_win) ); + if (!ptr) goto error; + } +#endif /* IPV6_PKTINFO */ + default: FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); break; @@ -1910,6 +1925,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, in_buffer, in_size ); #endif +#ifdef IPV6_RECVPKTINFO + case IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, in_buffer, in_size ); +#endif + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4babd888473..b7c1571b8b6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -318,6 +318,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); + DEBUG_SOCKOPT(WS_IPV6_PKTINFO); DEBUG_SOCKOPT(WS_IPV6_UNICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_V6ONLY); DEBUG_SOCKOPT(WS_IPV6_UNICAST_IF); @@ -1938,6 +1939,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_MULTICAST_LOOP: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_PKTINFO: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); @@ -3147,6 +3151,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_LOOP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_PKTINFO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO, optval, optlen ); + case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 12c1a859336..dd8c83374d0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2050,31 +2050,23 @@ static void test_ipv6_cmsg(void) memset(control, 0, sizeof(control)); msg.Control.len = sizeof(control); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&on, sizeof(on)); -todo_wine ok(!rc, "failed to set IPV6_PKTINFO, error %u\n", WSAGetLastError()); state = 0; count = sizeof(state); rc = getsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (char *)&state, (INT *)&count); -todo_wine ok(!rc, "failed to get IPV6_PKTINFO, error %u\n", WSAGetLastError()); -todo_wine ok(state == 1, "expected 1, got %u\n", state); rc = send(client, payload, sizeof(payload), 0); ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); -todo_wine ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); -todo_wine ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); -todo_wine ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); -todo_wine ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); -todo_wine ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); closesocket(server); diff --git a/include/config.h.in b/include/config.h.in index c1a68104fb8..ad770281471 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -645,6 +645,9 @@ /* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_HWADDR +/* Define to 1 if `ipi6_addr' is a member of `struct in6_pktinfo'. */ +#undef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR + /* Define to 1 if `ips_total' is a member of `struct ipstat'. */ #undef HAVE_STRUCT_IPSTAT_IPS_TOTAL diff --git a/include/wine/afd.h b/include/wine/afd.h index 0be0678606d..caa86eabf83 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -230,6 +230,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_TCP_NODELAY WINE_AFD_IOC(285) #define IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(286) #define IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(287) +#define IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO WINE_AFD_IOC(288) +#define IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO WINE_AFD_IOC(289) struct afd_create_params {

1 0

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-commits August 2021